Merge branch 'writeback-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / arch / x86 / include / asm / stackprotector.h

diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
index b5d9533d2c38f4e78485256ec9ba07497e93057e..6a998598f172424f198bf7e034676a8c47b2eb9b 100644 (file)
--- a/arch/x86/include/asm/stackprotector.h
+++ b/arch/x86/include/asm/stackprotector.h
@@ -75,9 +75,9 @@ static __always_inline void boot_init_stack_canary(void)
 
        current->stack_canary = canary;
 #ifdef CONFIG_X86_64
-       percpu_write(irq_stack_union.stack_canary, canary);
+       this_cpu_write(irq_stack_union.stack_canary, canary);
 #else
-       percpu_write(stack_canary.canary, canary);
+       this_cpu_write(stack_canary.canary, canary);
 #endif
 }