diff options
| author | Brian Gerst | 2009-01-19 04:21:28 +0100 |
|---|---|---|
| committer | Tejun Heo | 2009-01-20 04:29:20 +0100 |
| commit | 947e76cdc34c782fc947313d4331380686eebbad (patch) | |
| tree | de5d424c4760269fd7800bc745e48b060c725300 /arch/x86/include/asm/pda.h | |
| parent | x86: rework __per_cpu_load adjustments (diff) | |
| download | kernel-qcow2-linux-947e76cdc34c782fc947313d4331380686eebbad.tar.gz kernel-qcow2-linux-947e76cdc34c782fc947313d4331380686eebbad.tar.xz kernel-qcow2-linux-947e76cdc34c782fc947313d4331380686eebbad.zip | |
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/pda.h')
| -rw-r--r-- | arch/x86/include/asm/pda.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/include/asm/pda.h b/arch/x86/include/asm/pda.h index b473e952439a..ba46416634f0 100644 --- a/arch/x86/include/asm/pda.h +++ b/arch/x86/include/asm/pda.h @@ -17,9 +17,6 @@ struct x8664_pda { unsigned long unused4; int unused5; unsigned int unused6; /* 36 was cpunumber */ - unsigned long stack_canary; /* 40 stack canary value */ - /* gcc-ABI: this canary MUST be at - offset 40!!! */ short in_bootmem; /* pda lives in bootmem */ } ____cacheline_aligned_in_smp; |