diff options
| author | Brian Gerst <brgerst@gmail.com> | 2009-01-19 12:21:28 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-01-20 12:29:20 +0900 |
| commit | 947e76cdc34c782fc947313d4331380686eebbad (patch) | |
| tree | de5d424c4760269fd7800bc745e48b060c725300 /arch/x86/include/asm/percpu.h | |
| parent | 8c7e58e690ae60ab4215b025f433ed4af261e103 (diff) | |
| download | op-kernel-dev-947e76cdc34c782fc947313d4331380686eebbad.zip op-kernel-dev-947e76cdc34c782fc947313d4331380686eebbad.tar.gz | |
x86: move stack_canary into irq_stack
Impact: x86_64 percpu area layout change, irq_stack now at the beginning
Now that the PDA is empty except for the stack canary, it can be removed.
The irqstack is moved to the start of the per-cpu section. If the stack
protector is enabled, the canary overlaps the bottom 48 bytes of the irqstack.
tj: * updated subject
* dropped asm relocation of irq_stack_ptr
* updated comments a bit
* rebased on top of stack canary changes
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/percpu.h')
| -rw-r--r-- | arch/x86/include/asm/percpu.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h index 165d527..ce980db 100644 --- a/arch/x86/include/asm/percpu.h +++ b/arch/x86/include/asm/percpu.h @@ -133,12 +133,6 @@ do { \ /* We can use this directly for local CPU (faster). */ DECLARE_PER_CPU(unsigned long, this_cpu_off); -#ifdef CONFIG_X86_64 -extern void load_pda_offset(int cpu); -#else -static inline void load_pda_offset(int cpu) { } -#endif - #endif /* !__ASSEMBLY__ */ #ifdef CONFIG_SMP |
