patch-2.4.23 linux-2.4.23/arch/x86_64/kernel/smpboot.c
Next file: linux-2.4.23/arch/x86_64/kernel/suspend.c
Previous file: linux-2.4.23/arch/x86_64/kernel/smp.c
Back to the patch index
Back to the overall index
- Lines: 38
- Date:
2003-11-28 10:26:19.000000000 -0800
- Orig file:
linux-2.4.22/arch/x86_64/kernel/smpboot.c
- Orig date:
2003-06-13 07:51:32.000000000 -0700
diff -urN linux-2.4.22/arch/x86_64/kernel/smpboot.c linux-2.4.23/arch/x86_64/kernel/smpboot.c
@@ -50,6 +50,7 @@
#include <asm/kdebug.h>
#include <asm/timex.h>
#include <asm/proto.h>
+#include <asm/acpi.h>
/* Setup configured maximum number of CPUs to activate */
static int max_cpus = -1;
@@ -863,7 +864,7 @@
* If we couldnt find an SMP configuration at boot time,
* get out of here now!
*/
- if (!smp_found_config) {
+ if (!smp_found_config && !acpi_lapic) {
printk(KERN_NOTICE "SMP motherboard not detected.\n");
io_apic_irqs = 0;
cpu_online_map = phys_cpu_present_map = 1;
@@ -907,10 +908,8 @@
if (!max_cpus) {
smp_found_config = 0;
printk(KERN_INFO "SMP mode deactivated, forcing use of dummy APIC emulation.\n");
- io_apic_irqs = 0;
cpu_online_map = phys_cpu_present_map = 1;
smp_num_cpus = 1;
- apic_disabled = 1;
goto smp_done;
}
@@ -1012,6 +1011,9 @@
if (cpu_has_tsc && cpucount)
synchronize_tsc_bp();
+ if (nmi_watchdog != 0)
+ check_nmi_watchdog();
+
smp_done:
zap_low_mappings();
time_init_smp();
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)