Signed-off-by: Thomas Renninger <trenn@xxxxxxx> --- drivers/acpi/blacklist.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index 09c6980..b64bdeb 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/blacklist.c @@ -183,6 +183,13 @@ static int __init dmi_disable_osi_vista(const struct dmi_system_id *d) return 0; } +static int __init dmi_use_rsdt(const struct dmi_system_id *d) +{ + printk(KERN_NOTICE PREFIX "DMI detected: %s, using rsdt\n", d->ident); + acpi_rsdt_forced = 1; + return 0; +} + static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { { .callback = dmi_disable_osi_vista, @@ -235,6 +242,20 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X61"), }, }, + { + .callback = dmi_use_rsdt, + .ident = "ThinkPad R40e family", /* R40e, broken C-states */ + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), + DMI_MATCH(DMI_BIOS_VERSION, "1SET")}, + }, + { + .callback = dmi_use_rsdt, + .ident = "ThinkPad R50e family", /* R50e, slow booting */ + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), + DMI_MATCH(DMI_BIOS_VERSION, "1WET")}, + }, {} }; -- 1.6.0.2 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html