|
@@ -1292,23 +1292,6 @@ static int __init dmi_disable_acpi(const struct dmi_system_id *d)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-/*
|
|
|
- * Limit ACPI to CPU enumeration for HT
|
|
|
- */
|
|
|
-static int __init force_acpi_ht(const struct dmi_system_id *d)
|
|
|
-{
|
|
|
- if (!acpi_force) {
|
|
|
- printk(KERN_NOTICE "%s detected: force use of acpi=ht\n",
|
|
|
- d->ident);
|
|
|
- disable_acpi();
|
|
|
- acpi_ht = 1;
|
|
|
- } else {
|
|
|
- printk(KERN_NOTICE
|
|
|
- "Warning: acpi=force overrules DMI blacklist: acpi=ht\n");
|
|
|
- }
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
/*
|
|
|
* Force ignoring BIOS IRQ0 pin2 override
|
|
|
*/
|
|
@@ -1344,82 +1327,6 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
|
|
|
},
|
|
|
},
|
|
|
|
|
|
- /*
|
|
|
- * Boxes that need acpi=ht
|
|
|
- */
|
|
|
- {
|
|
|
- .callback = force_acpi_ht,
|
|
|
- .ident = "FSC Primergy T850",
|
|
|
- .matches = {
|
|
|
- DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
|
|
|
- DMI_MATCH(DMI_PRODUCT_NAME, "PRIMERGY T850"),
|
|
|
- },
|
|
|
- },
|
|
|
- {
|
|
|
- .callback = force_acpi_ht,
|
|
|
- .ident = "HP VISUALIZE NT Workstation",
|
|
|
- .matches = {
|
|
|
- DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
|
|
|
- DMI_MATCH(DMI_PRODUCT_NAME, "HP VISUALIZE NT Workstation"),
|
|
|
- },
|
|
|
- },
|
|
|
- {
|
|
|
- .callback = force_acpi_ht,
|
|
|
- .ident = "Compaq Workstation W8000",
|
|
|
- .matches = {
|
|
|
- DMI_MATCH(DMI_SYS_VENDOR, "Compaq"),
|
|
|
- DMI_MATCH(DMI_PRODUCT_NAME, "Workstation W8000"),
|
|
|
- },
|
|
|
- },
|
|
|
- {
|
|
|
- .callback = force_acpi_ht,
|
|
|
- .ident = "ASUS CUR-DLS",
|
|
|
- .matches = {
|
|
|
- DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
|
|
|
- DMI_MATCH(DMI_BOARD_NAME, "CUR-DLS"),
|
|
|
- },
|
|
|
- },
|
|
|
- {
|
|
|
- .callback = force_acpi_ht,
|
|
|
- .ident = "ABIT i440BX-W83977",
|
|
|
- .matches = {
|
|
|
- DMI_MATCH(DMI_BOARD_VENDOR, "ABIT <http://www.abit.com>"),
|
|
|
- DMI_MATCH(DMI_BOARD_NAME, "i440BX-W83977 (BP6)"),
|
|
|
- },
|
|
|
- },
|
|
|
- {
|
|
|
- .callback = force_acpi_ht,
|
|
|
- .ident = "IBM Bladecenter",
|
|
|
- .matches = {
|
|
|
- DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),
|
|
|
- DMI_MATCH(DMI_BOARD_NAME, "IBM eServer BladeCenter HS20"),
|
|
|
- },
|
|
|
- },
|
|
|
- {
|
|
|
- .callback = force_acpi_ht,
|
|
|
- .ident = "IBM eServer xSeries 360",
|
|
|
- .matches = {
|
|
|
- DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),
|
|
|
- DMI_MATCH(DMI_BOARD_NAME, "eServer xSeries 360"),
|
|
|
- },
|
|
|
- },
|
|
|
- {
|
|
|
- .callback = force_acpi_ht,
|
|
|
- .ident = "IBM eserver xSeries 330",
|
|
|
- .matches = {
|
|
|
- DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),
|
|
|
- DMI_MATCH(DMI_BOARD_NAME, "eserver xSeries 330"),
|
|
|
- },
|
|
|
- },
|
|
|
- {
|
|
|
- .callback = force_acpi_ht,
|
|
|
- .ident = "IBM eserver xSeries 440",
|
|
|
- .matches = {
|
|
|
- DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),
|
|
|
- DMI_MATCH(DMI_PRODUCT_NAME, "eserver xSeries 440"),
|
|
|
- },
|
|
|
- },
|
|
|
-
|
|
|
/*
|
|
|
* Boxes that need ACPI PCI IRQ routing disabled
|
|
|
*/
|