---

yaml --- r: 1720 b: refs/heads/master c: adaa765 h: refs/heads/master v: v3
git-mirror · May 31, 2005 · cb1093e · cb1093e
1 parent 2d373c5
commit cb1093e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c2be6a0fa186e2cb0cf14f41f20b08a5809a026
+refs/heads/master: adaa765d76f58b47e10a4760f2c0bc86de5479b9
diff --git a/trunk/arch/i386/kernel/setup.c b/trunk/arch/i386/kernel/setup.c
@@ -1502,11 +1502,13 @@ void __init setup_arch(char **cmdline_p)
 	if (efi_enabled)
 		efi_map_memmap();
 
+#ifdef CONFIG_ACPI_BOOT
 	/*
 	 * Parse the ACPI tables for possible boot-time SMP configuration.
 	 */
 	acpi_boot_table_init();
 	acpi_boot_init();
+#endif
 
 #ifdef CONFIG_X86_LOCAL_APIC
 	if (smp_found_config)