aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/smpboot.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-03-15 03:29:44 -0400
committerIngo Molnar <mingo@elte.hu>2011-03-15 03:29:44 -0400
commit8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2 (patch)
tree7e5f6d050b72ab08a4497e82a4a103fefb086e80 /arch/x86/kernel/smpboot.c
parent56396e6823fe9b42fe9cf9403d6ed67756255f70 (diff)
parent521cb40b0c44418a4fd36dc633f575813d59a43d (diff)
Merge commit 'v2.6.38' into x86/mm
Conflicts: arch/x86/mm/numa_64.c Merge reason: Resolve the conflict, update the branch to .38. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r--arch/x86/kernel/smpboot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index fe4837136e02..a9d805f3920c 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -999,7 +999,7 @@ static int __init smp_sanity_check(unsigned max_cpus)
999 999
1000 connect_bsp_APIC(); 1000 connect_bsp_APIC();
1001 setup_local_APIC(); 1001 setup_local_APIC();
1002 end_local_APIC_setup(); 1002 bsp_end_local_APIC_setup();
1003 return -1; 1003 return -1;
1004 } 1004 }
1005 1005
@@ -1074,7 +1074,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
1074 if (!skip_ioapic_setup && nr_ioapics) 1074 if (!skip_ioapic_setup && nr_ioapics)
1075 enable_IO_APIC(); 1075 enable_IO_APIC();
1076 1076
1077 end_local_APIC_setup(); 1077 bsp_end_local_APIC_setup();
1078 1078
1079 if (apic->setup_portio_remap) 1079 if (apic->setup_portio_remap)
1080 apic->setup_portio_remap(); 1080 apic->setup_portio_remap();