From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/arch/x86/include/asm/stackprotector.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'kernel/arch/x86/include/asm/stackprotector.h') diff --git a/kernel/arch/x86/include/asm/stackprotector.h b/kernel/arch/x86/include/asm/stackprotector.h index 64fb5cbe5..02fa39652 100644 --- a/kernel/arch/x86/include/asm/stackprotector.h +++ b/kernel/arch/x86/include/asm/stackprotector.h @@ -39,7 +39,9 @@ #include #include #include + #include +#include /* * 24 byte read-only segment initializer for stack canary. Linker @@ -72,13 +74,12 @@ static __always_inline void boot_init_stack_canary(void) * For preempt-rt we need to weaken the randomness a bit, as * we can't call into the random generator from atomic context * due to locking constraints. We just leave canary - * uninitialized and use the TSC based randomness on top of - * it. + * uninitialized and use the TSC based randomness on top of it. */ #ifndef CONFIG_PREEMPT_RT_FULL get_random_bytes(&canary, sizeof(canary)); #endif - tsc = __native_read_tsc(); + tsc = rdtsc(); canary += tsc + (tsc << 32UL); current->stack_canary = canary; -- cgit 1.2.3-korg