diff -urNd linux/arch/i386/kernel/setup.c linux/arch/i386/kernel/setup.c.new
--- linux/arch/i386/kernel/setup.c	Wed May  8 10:44:31 2002
+++ linux/arch/i386/kernel/setup.c.new	Thu May  9 09:58:06 2002
@@ -1068,7 +1068,11 @@
 	/*
 	 * get boot-time SMP configuration:
 	 */
-	if (smp_found_config && !acpi_mp_config)
+	if (smp_found_config
+#ifdef CONFIG_ACPI_BOOT
+		&& !acpi_mp_config
+#endif
+	   )
 		get_smp_config();
 #endif
 
diff -urNd linux/arch/i386/kernel/mpparse.c linux/arch/i386/kernel/mpparse.c.new
--- linux/arch/i386/kernel/mpparse.c	Fri May 10 11:24:43 2002
+++ linux/arch/i386/kernel/mpparse.c.new	Thu May  9 10:06:23 2002
@@ -432,7 +432,9 @@
 	 * Save the local APIC address (it might be non-default), but only 
 	 * if we're not using the ACPI tables.
 	 */
+#ifdef CONFIG_ACPI_BOOT
 	if (!acpi_mp_config)
+#endif
 		mp_lapic_addr = mpc->mpc_lapic;
 
 	if (clustered_apic_mode && mpc->mpc_oemptr) {
@@ -514,7 +516,9 @@
 					(struct mpc_config_processor *)mpt;
 
 				/* ACPI may already have provided this one for us */
+#ifdef CONFIG_ACPI_BOOT
 				if (!acpi_mp_config)
+#endif
 					MP_processor_info(m);
 				mpt += sizeof(*m);
 				count += sizeof(*m);