diff options
| author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2010-10-22 16:24:06 -0400 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2010-10-22 16:24:06 -0400 |
| commit | 67ba37293e938208795d6a3562201bdb0cf43393 (patch) | |
| tree | 3522e949ff19f3809583bfb3fa3973ddf264689d /arch/x86/kernel/setup_percpu.c | |
| parent | cd07202cc8262e1669edff0d97715f3dd9260917 (diff) | |
| parent | 5bba6c56dc99ff88f79a79572e29ecf445710878 (diff) | |
Merge commit 'konrad/stable/xen-pcifront-0.8.2' into 2.6.36-rc8-initial-domain-v6
Diffstat (limited to 'arch/x86/kernel/setup_percpu.c')
| -rw-r--r-- | arch/x86/kernel/setup_percpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index a60df9ae6454..2335c15c93a4 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c | |||
| @@ -253,7 +253,7 @@ void __init setup_per_cpu_areas(void) | |||
| 253 | * Up to this point, the boot CPU has been using .init.data | 253 | * Up to this point, the boot CPU has been using .init.data |
| 254 | * area. Reload any changed state for the boot CPU. | 254 | * area. Reload any changed state for the boot CPU. |
| 255 | */ | 255 | */ |
| 256 | if (cpu == boot_cpu_id) | 256 | if (!cpu) |
| 257 | switch_to_new_gdt(cpu); | 257 | switch_to_new_gdt(cpu); |
| 258 | } | 258 | } |
| 259 | 259 | ||