summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlok Kataria <akataria@vmware.com>2009-08-04 15:34:22 -0700
committerIngo Molnar <mingo@elte.hu>2009-08-05 10:20:29 +0200
commit7d5b005652bc5ae3e1e0efc53fd0e25a643ec506 (patch)
treed68a3d7cae8eb10a61ee72a68423dde0c0c4aeb2 /arch
parent90bc1a658a53f8832ee799685703977a450e5af9 (diff)
downloadop-kernel-dev-7d5b005652bc5ae3e1e0efc53fd0e25a643ec506.zip
op-kernel-dev-7d5b005652bc5ae3e1e0efc53fd0e25a643ec506.tar.gz
x86: Fix VMI && stack protector
With CONFIG_STACK_PROTECTOR turned on, VMI doesn't boot with more than one processor. The problem is with the gs value not being initialized correctly when registering the secondary processor for VMI's case. The patch below initializes the gs value for the AP to __KERNEL_STACK_CANARY. Without this the secondary processor keeps on taking a GP on every gs access. Signed-off-by: Alok N Kataria <akataria@vmware.com> Cc: <stable@kernel.org> # for v2.6.30.x LKML-Reference: <1249425262.18955.40.camel@ank32.eng.vmware.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/vmi_32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c
index b263423..95a7289 100644
--- a/arch/x86/kernel/vmi_32.c
+++ b/arch/x86/kernel/vmi_32.c
@@ -441,7 +441,7 @@ vmi_startup_ipi_hook(int phys_apicid, unsigned long start_eip,
ap.ds = __USER_DS;
ap.es = __USER_DS;
ap.fs = __KERNEL_PERCPU;
- ap.gs = 0;
+ ap.gs = __KERNEL_STACK_CANARY;
ap.eflags = 0;
OpenPOWER on IntegriCloud