summaryrefslogtreecommitdiffstats
path: root/arch/x86/entry
diff options
context:
space:
mode:
authorPeter Zijlstra (Intel) <peterz@infradead.org>2022-10-17 16:41:06 +0200
committerPeter Zijlstra <peterz@infradead.org>2022-10-17 16:41:06 +0200
commit5b71ac8a2a3185da34a6556e791b533b48183a41 (patch)
tree79797c0e775ba521b9bfc2d14c4605878687e297 /arch/x86/entry
parent7fcecafebed90d03f35bec6e147fc0b5f6e1bc71 (diff)
downloadlinux-5b71ac8a2a3185da34a6556e791b533b48183a41.tar.bz2
x86: Fixup asm-offsets duplicate
It turns out that 'stack_canary_offset' is a variable name; shadowing that with a #define is ripe of fail when the asm-offsets.h header gets included. Rename the thing. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Diffstat (limited to 'arch/x86/entry')
-rw-r--r--arch/x86/entry/entry_64.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 9249a45cf53f..5c578a7dfcd7 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -252,7 +252,7 @@ SYM_FUNC_START(__switch_to_asm)
#ifdef CONFIG_STACKPROTECTOR
movq TASK_stack_canary(%rsi), %rbx
- movq %rbx, PER_CPU_VAR(fixed_percpu_data) + stack_canary_offset
+ movq %rbx, PER_CPU_VAR(fixed_percpu_data) + FIXED_stack_canary
#endif
/*