diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index d37593c..6940fb2 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1379,12 +1379,14 @@ static void __init acpi_process_madt(void)
  		 * ACPI found no MADT, and so ACPI wants UP PIC mode.
  		 * In the event an MPS table was found, forget it.
  		 * Boot with "acpi=off" to use MPS on such a system.
+		 *
+		 * NOTE:  This assumption seems wrong in at least some cases, perhaps
+		 *  when ACPI is off in the BIOS.  Changing to a warning without
+		 *  setting smp_found_config to zero.
  		 */
-		if (smp_found_config) {
+		if (smp_found_config)
 			printk(KERN_WARNING PREFIX
-				"No APIC-table, disabling MPS\n");
-			smp_found_config = 0;
-		}
+			       "WARNING: No APIC-table found.\n");
 	}
 
 	/*