From 91ad73012fa72674e1489751a36acb1af7c24605 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Tue, 28 Sep 2010 17:48:49 -0400 Subject: [PATCH] --- yaml --- r: 211183 b: refs/heads/master c: bbb7030fbb6469c46974c4736a5f90d12102f299 h: refs/heads/master i: 211181: a620e4b16bf21a17ef1c73996ef5caeadc16897f 211179: 3c2abf0ae567eb5ec3dc86e150affff0dac340c8 211175: 48e1a7b1cb8664118f843ab32350eb61ba7aac78 211167: 00f1fefef99ec3bad671d2508990dace0957c9d5 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/blacklist.c | 2 ++ trunk/drivers/acpi/processor_core.c | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 407953670240..157ad3f0c7c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64a32307b710c100beb101e9c78f8022f0e8ba61 +refs/heads/master: bbb7030fbb6469c46974c4736a5f90d12102f299 diff --git a/trunk/drivers/acpi/blacklist.c b/trunk/drivers/acpi/blacklist.c index 2bb28b9d91c4..3eda6c040400 100644 --- a/trunk/drivers/acpi/blacklist.c +++ b/trunk/drivers/acpi/blacklist.c @@ -183,6 +183,8 @@ static int __init dmi_disable_osi_vista(const struct dmi_system_id *d) { printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident); acpi_osi_setup("!Windows 2006"); + acpi_osi_setup("!Windows 2006 SP1"); + acpi_osi_setup("!Windows 2006 SP2"); return 0; } static int __init dmi_disable_osi_win7(const struct dmi_system_id *d) diff --git a/trunk/drivers/acpi/processor_core.c b/trunk/drivers/acpi/processor_core.c index b618f888d66b..e9699aaed109 100644 --- a/trunk/drivers/acpi/processor_core.c +++ b/trunk/drivers/acpi/processor_core.c @@ -28,6 +28,12 @@ static int set_no_mwait(const struct dmi_system_id *id) } static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = { + { + set_no_mwait, "IFL91 board", { + DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"), + DMI_MATCH(DMI_SYS_VENDOR, "ZEPTO"), + DMI_MATCH(DMI_PRODUCT_VERSION, "3215W"), + DMI_MATCH(DMI_BOARD_NAME, "IFL91") }, NULL}, { set_no_mwait, "Extensa 5220", { DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),