1 files changed, 8 insertions, 6 deletions

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 4c785a67d585..daee69579b1c 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -1066,6 +1066,14 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
                      DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
                      },
          },
+        {
+         .callback = disable_acpi_pci,
+         .ident = "HP xw9300",
+         .matches = {
+                    DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                    DMI_MATCH(DMI_PRODUCT_NAME, "HP xw9300 Workstation"),
+                    },
+        },
         {}
 };
 
@@ -1102,9 +1110,6 @@ int __init acpi_boot_table_init(void)
         dmi_check_system(acpi_dmi_table);
 #endif
 
-        if (!cpu_has_apic)
-                return -ENODEV;
-
         /*
          * If acpi_disabled, bail out
          * One exception: acpi=ht continues far enough to enumerate LAPICs
@@ -1151,9 +1156,6 @@ int __init acpi_boot_init(void)
 
         acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);
 
-        if (!cpu_has_apic)
-                return -ENODEV;
-
         /*
          * set sci_int and PM timer address
          */