aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/smpboot_64.c
diff options
context:
space:
mode:
authorGlauber de Oliveira Costa <gcosta@redhat.com>2008-03-19 13:26:10 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:41:04 -0400
commit9f3734f631267d2f36008833b62670ca342ac000 (patch)
treead9a7b6c1b0ab765556df7b8716effb7d148ffd8 /arch/x86/kernel/smpboot_64.c
parent771263d31114adb5e234364a58280c876c2ed182 (diff)
x86: introduce smpboot_clear_io_apic
x86_64 has two nr_ioapics = 0 statements. In 32-bit, it can be done too. We do it through the smpboot_clear_io_apic() inline function, to cope with subarchitectures (visws) that does not compile mpparse in Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot_64.c')
-rw-r--r--arch/x86/kernel/smpboot_64.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index c66fb15b0131..775244545ffa 100644
--- a/arch/x86/kernel/smpboot_64.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -134,7 +134,7 @@ static int __init smp_sanity_check(unsigned max_cpus)
134 printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n", 134 printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n",
135 boot_cpu_physical_apicid); 135 boot_cpu_physical_apicid);
136 printk(KERN_ERR "... forcing use of dummy APIC emulation. (tell your hw vendor)\n"); 136 printk(KERN_ERR "... forcing use of dummy APIC emulation. (tell your hw vendor)\n");
137 nr_ioapics = 0; 137 smpboot_clear_io_apic();
138 return -1; 138 return -1;
139 } 139 }
140 140
@@ -145,7 +145,7 @@ static int __init smp_sanity_check(unsigned max_cpus)
145 */ 145 */
146 if (!max_cpus) { 146 if (!max_cpus) {
147 printk(KERN_INFO "SMP mode deactivated, forcing use of dummy APIC emulation.\n"); 147 printk(KERN_INFO "SMP mode deactivated, forcing use of dummy APIC emulation.\n");
148 nr_ioapics = 0; 148 smpboot_clear_io_apic();
149 return -1; 149 return -1;
150 } 150 }
151 151