diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-04 19:58:26 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-04 19:58:26 -0500 |
| commit | 327641da8e3e227f42690479182b896fd19486be (patch) | |
| tree | 05fa7f317e854f2da5d46d4c8977486d71bb2b21 /arch/x86/kernel/setup_percpu.c | |
| parent | 1f4f931501e9270c156d05ee76b7b872de486304 (diff) | |
| parent | ef3892bd63420380d115f755d351d2071f1f805f (diff) | |
Merge branch 'core/percpu' into x86/paravirt
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 0d1e7ac439f4..ef91747bbed5 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c | |||
| @@ -122,7 +122,7 @@ void __init setup_per_cpu_areas(void) | |||
| 122 | * area. Reload any changed state for the boot CPU. | 122 | * area. Reload any changed state for the boot CPU. |
| 123 | */ | 123 | */ |
| 124 | if (cpu == boot_cpu_id) | 124 | if (cpu == boot_cpu_id) |
| 125 | switch_to_new_gdt(); | 125 | switch_to_new_gdt(cpu); |
| 126 | 126 | ||
| 127 | DBG("PERCPU: cpu %4d %p\n", cpu, ptr); | 127 | DBG("PERCPU: cpu %4d %p\n", cpu, ptr); |
| 128 | } | 128 | } |