diff options
author | Tejun Heo <tj@kernel.org> | 2009-01-19 22:29:19 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2009-01-19 22:29:19 -0500 |
commit | c6e50f93db5bd0895ec7c7d1b6f3886c6e1f11b6 (patch) | |
tree | 3d6b2d04118bb61fb50cf7624aaf7f7e4f5916ce /arch/x86/kernel/process_64.c | |
parent | 7890ba8c87604ca4c2c73f7de846bf5305d743e4 (diff) |
x86: cleanup stack protector
Impact: cleanup
Make the following cleanups.
* remove duplicate comment from boot_init_stack_canary() which fits
better in the other place - cpu_idle().
* move stack_canary offset check from __switch_to() to
boot_init_stack_canary().
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/x86/kernel/process_64.c')
-rw-r--r-- | arch/x86/kernel/process_64.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index aa89eabf09e0..088bc9a0f82c 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
@@ -638,13 +638,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) | |||
638 | percpu_write(kernel_stack, | 638 | percpu_write(kernel_stack, |
639 | (unsigned long)task_stack_page(next_p) + | 639 | (unsigned long)task_stack_page(next_p) + |
640 | THREAD_SIZE - KERNEL_STACK_OFFSET); | 640 | THREAD_SIZE - KERNEL_STACK_OFFSET); |
641 | #ifdef CONFIG_CC_STACKPROTECTOR | ||
642 | /* | ||
643 | * Build time only check to make sure the stack_canary is at | ||
644 | * offset 40 in the pda; this is a gcc ABI requirement | ||
645 | */ | ||
646 | BUILD_BUG_ON(offsetof(struct x8664_pda, stack_canary) != 40); | ||
647 | #endif | ||
648 | 641 | ||
649 | /* | 642 | /* |
650 | * Now maybe reload the debug registers and handle I/O bitmaps | 643 | * Now maybe reload the debug registers and handle I/O bitmaps |