diff options
| author | Peter Zijlstra (Intel) <peterz@infradead.org> | 2022-10-17 16:41:06 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2022-10-17 16:41:06 +0200 |
| commit | 5b71ac8a2a3185da34a6556e791b533b48183a41 (patch) | |
| tree | 79797c0e775ba521b9bfc2d14c4605878687e297 /arch/x86/kernel/asm-offsets_64.c | |
| parent | x86/softirq: Move softirq pending next to current task (diff) | |
| download | linux-5b71ac8a2a3185da34a6556e791b533b48183a41.tar.xz linux-5b71ac8a2a3185da34a6556e791b533b48183a41.zip | |
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/kernel/asm-offsets_64.c')
| -rw-r--r-- | arch/x86/kernel/asm-offsets_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c index 9b698215d261..bb65371ea9df 100644 --- a/arch/x86/kernel/asm-offsets_64.c +++ b/arch/x86/kernel/asm-offsets_64.c @@ -57,7 +57,7 @@ int main(void) BLANK(); #ifdef CONFIG_STACKPROTECTOR - DEFINE(stack_canary_offset, offsetof(struct fixed_percpu_data, stack_canary)); + OFFSET(FIXED_stack_canary, fixed_percpu_data, stack_canary); BLANK(); #endif return 0; |