Merge linux-2.6 with linux-acpi-2.6

2005-09-08 01:45:47 -04:00
parent 4a35a46bf1 caf39e87cc
commit 64e47488c9
1968 changed files with 58374 additions and 48994 deletions
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -814,6 +814,9 @@ static void __init acpi_process_madt(void)
 		if (!error) {
 			acpi_lapic = 1;

+#ifdef CONFIG_X86_GENERICARCH
+			generic_bigsmp_probe();
+#endif
 			/*
 			 * Parse MADT IO-APIC entries
 			 */