diff options
| author | Andi Kleen | 2006-01-16 01:56:48 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-01-16 20:27:59 +0100 |
| commit | 142a64a650fa5786c2ecea3de5ae3d5a2de72312 (patch) | |
| tree | 1216c324cfb4abf6a3b4a0650899da30441edea9 /arch | |
| parent | [PATCH] x86_64: lapic resume uses correct base address (diff) | |
| download | kernel-qcow2-linux-142a64a650fa5786c2ecea3de5ae3d5a2de72312.tar.gz kernel-qcow2-linux-142a64a650fa5786c2ecea3de5ae3d5a2de72312.tar.xz kernel-qcow2-linux-142a64a650fa5786c2ecea3de5ae3d5a2de72312.zip | |
[PATCH] x86_64: set do_not_nx as cpuinitdata
'check_efer' uses 'do_not_nx'. Hotpluged CPU could wrongly disable NX.
Signed-off-by: Shaohua Li<shaohua.li@intel.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86_64/kernel/setup64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/setup64.c b/arch/x86_64/kernel/setup64.c index 6eff51e9400c..8ac4db09610a 100644 --- a/arch/x86_64/kernel/setup64.c +++ b/arch/x86_64/kernel/setup64.c @@ -38,7 +38,7 @@ struct desc_ptr idt_descr = { 256 * 16, (unsigned long) idt_table }; char boot_cpu_stack[IRQSTACKSIZE] __attribute__((section(".bss.page_aligned"))); unsigned long __supported_pte_mask __read_mostly = ~0UL; -static int do_not_nx __initdata = 0; +static int do_not_nx __cpuinitdata = 0; /* noexec=on|off Control non executable mappings for 64bit processes. |