diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 00:00:02 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 00:00:02 -0400 |
| commit | 4b6b987969b076298485697bfb0d0e35502642a3 (patch) | |
| tree | a8f5ebd6a0b9efbe30272012d759669b0c5ddc13 /arch/x86/kernel/vmi_32.c | |
| parent | df47cd096c8f54a5242e3a2ffb4525c804567eda (diff) | |
| parent | 60e0a4c7adc700f2d2929cdb2d0055e519a3eb3d (diff) | |
Merge branch 'master' into sh/hwblk
Diffstat (limited to 'arch/x86/kernel/vmi_32.c')
| -rw-r--r-- | arch/x86/kernel/vmi_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c index b263423fbe2a..95a7289e4b0c 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, | |||
| 441 | ap.ds = __USER_DS; | 441 | ap.ds = __USER_DS; |
| 442 | ap.es = __USER_DS; | 442 | ap.es = __USER_DS; |
| 443 | ap.fs = __KERNEL_PERCPU; | 443 | ap.fs = __KERNEL_PERCPU; |
| 444 | ap.gs = 0; | 444 | ap.gs = __KERNEL_STACK_CANARY; |
| 445 | 445 | ||
| 446 | ap.eflags = 0; | 446 | ap.eflags = 0; |
| 447 | 447 | ||