diff options
Diffstat (limited to 'arch/x86/kernel/acpi')
-rw-r--r-- | arch/x86/kernel/acpi/boot.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 0d1c26a583c5..8072edb62478 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -1598,6 +1598,11 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { | |||
1598 | DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), | 1598 | DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), |
1599 | }, | 1599 | }, |
1600 | }, | 1600 | }, |
1601 | {} | ||
1602 | }; | ||
1603 | |||
1604 | /* second table for DMI checks that should run after early-quirks */ | ||
1605 | static struct dmi_system_id __initdata acpi_dmi_table_late[] = { | ||
1601 | /* | 1606 | /* |
1602 | * HP laptops which use a DSDT reporting as HP/SB400/10000, | 1607 | * HP laptops which use a DSDT reporting as HP/SB400/10000, |
1603 | * which includes some code which overrides all temperature | 1608 | * which includes some code which overrides all temperature |
@@ -1726,6 +1731,9 @@ int __init early_acpi_boot_init(void) | |||
1726 | 1731 | ||
1727 | int __init acpi_boot_init(void) | 1732 | int __init acpi_boot_init(void) |
1728 | { | 1733 | { |
1734 | /* those are executed after early-quirks are executed */ | ||
1735 | dmi_check_system(acpi_dmi_table_late); | ||
1736 | |||
1729 | /* | 1737 | /* |
1730 | * If acpi_disabled, bail out | 1738 | * If acpi_disabled, bail out |
1731 | * One exception: acpi=ht continues far enough to enumerate LAPICs | 1739 | * One exception: acpi=ht continues far enough to enumerate LAPICs |