diff options
| author | Glauber de Oliveira Costa | 2008-03-19 18:26:10 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2008-04-17 17:41:04 +0200 |
| commit | 9f3734f631267d2f36008833b62670ca342ac000 (patch) | |
| tree | ad9a7b6c1b0ab765556df7b8716effb7d148ffd8 /arch/x86/kernel/smpboot_64.c | |
| parent | x86: change x86_64 sanity checks to match i386. (diff) | |
| download | kernel-qcow2-linux-9f3734f631267d2f36008833b62670ca342ac000.tar.gz kernel-qcow2-linux-9f3734f631267d2f36008833b62670ca342ac000.tar.xz kernel-qcow2-linux-9f3734f631267d2f36008833b62670ca342ac000.zip | |
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.c | 4 |
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) printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n", boot_cpu_physical_apicid); printk(KERN_ERR "... forcing use of dummy APIC emulation. (tell your hw vendor)\n"); - nr_ioapics = 0; + smpboot_clear_io_apic(); return -1; } @@ -145,7 +145,7 @@ static int __init smp_sanity_check(unsigned max_cpus) */ if (!max_cpus) { printk(KERN_INFO "SMP mode deactivated, forcing use of dummy APIC emulation.\n"); - nr_ioapics = 0; + smpboot_clear_io_apic(); return -1; } |