1 files changed, 51 insertions, 16 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 807b0df308f1..552420e1f890 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -95,22 +95,57 @@ static int set_max_cstate(struct dmi_system_id *id)
 }
 static struct dmi_system_id __initdata processor_power_dmi_table[] = {
-        {set_max_cstate, "IBM ThinkPad R40e", {
+        { set_max_cstate, "IBM ThinkPad R40e", {
-                                               DMI_MATCH(DMI_BIOS_VENDOR,
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-                                                         "IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW")}, (void *)1},
-                                               DMI_MATCH(DMI_BIOS_VERSION,
+        { set_max_cstate, "IBM ThinkPad R40e", {
-                                                         "1SET60WW")},
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-         (void *)1},
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET43WW") }, (void*)1},
-        {set_max_cstate, "Medion 41700", {
+        { set_max_cstate, "IBM ThinkPad R40e", {
-                                          DMI_MATCH(DMI_BIOS_VENDOR,
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-                                                    "Phoenix Technologies LTD"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET45WW") }, (void*)1},
-                                          DMI_MATCH(DMI_BIOS_VERSION,
+        { set_max_cstate, "IBM ThinkPad R40e", {
-                                                    "R01-A1J")}, (void *)1},
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-        {set_max_cstate, "Clevo 5600D", {
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET47WW") }, (void*)1},
-                                         DMI_MATCH(DMI_BIOS_VENDOR,
+        { set_max_cstate, "IBM ThinkPad R40e", {
-                                                   "Phoenix Technologies LTD"),
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-                                         DMI_MATCH(DMI_BIOS_VERSION,
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET50WW") }, (void*)1},
-                                                   "SHE845M0.86C.0013.D.0302131307")},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET52WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET55WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET56WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET59WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET61WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET62WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET64WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET65WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET68WW") }, (void*)1},
+        { set_max_cstate, "Medion 41700", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"),
+          DMI_MATCH(DMI_BIOS_VERSION,"R01-A1J")}, (void *)1},
+        { set_max_cstate, "Clevo 5600D", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"),
+          DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")},
         (void *)2},
        {},
 };

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 807b0df308f1..552420e1f890 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c
@@ -95,22 +95,57 @@ static int set_max_cstate(struct dmi_system_id *id)
95	}	95	}
96		96
97	static struct dmi_system_id __initdata processor_power_dmi_table[] = {	97	static struct dmi_system_id __initdata processor_power_dmi_table[] = {
98	{set_max_cstate, "IBM ThinkPad R40e", {	98	{ set_max_cstate, "IBM ThinkPad R40e", {
99	DMI_MATCH(DMI_BIOS_VENDOR,	99	DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
100	"IBM"),	100	DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW")}, (void *)1},
101	DMI_MATCH(DMI_BIOS_VERSION,	101	{ set_max_cstate, "IBM ThinkPad R40e", {
102	"1SET60WW")},	102	DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
103	(void *)1},	103	DMI_MATCH(DMI_BIOS_VERSION,"1SET43WW") }, (void*)1},
104	{set_max_cstate, "Medion 41700", {	104	{ set_max_cstate, "IBM ThinkPad R40e", {
105	DMI_MATCH(DMI_BIOS_VENDOR,	105	DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
106	"Phoenix Technologies LTD"),	106	DMI_MATCH(DMI_BIOS_VERSION,"1SET45WW") }, (void*)1},
107	DMI_MATCH(DMI_BIOS_VERSION,	107	{ set_max_cstate, "IBM ThinkPad R40e", {
108	"R01-A1J")}, (void *)1},	108	DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
109	{set_max_cstate, "Clevo 5600D", {	109	DMI_MATCH(DMI_BIOS_VERSION,"1SET47WW") }, (void*)1},
110	DMI_MATCH(DMI_BIOS_VENDOR,	110	{ set_max_cstate, "IBM ThinkPad R40e", {
111	"Phoenix Technologies LTD"),	111	DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
112	DMI_MATCH(DMI_BIOS_VERSION,	112	DMI_MATCH(DMI_BIOS_VERSION,"1SET50WW") }, (void*)1},
113	"SHE845M0.86C.0013.D.0302131307")},	113	{ set_max_cstate, "IBM ThinkPad R40e", {
		114	DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
		115	DMI_MATCH(DMI_BIOS_VERSION,"1SET52WW") }, (void*)1},
		116	{ set_max_cstate, "IBM ThinkPad R40e", {
		117	DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
		118	DMI_MATCH(DMI_BIOS_VERSION,"1SET55WW") }, (void*)1},
		119	{ set_max_cstate, "IBM ThinkPad R40e", {
		120	DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
		121	DMI_MATCH(DMI_BIOS_VERSION,"1SET56WW") }, (void*)1},
		122	{ set_max_cstate, "IBM ThinkPad R40e", {
		123	DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
		124	DMI_MATCH(DMI_BIOS_VERSION,"1SET59WW") }, (void*)1},
		125	{ set_max_cstate, "IBM ThinkPad R40e", {
		126	DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
		127	DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW") }, (void*)1},
		128	{ set_max_cstate, "IBM ThinkPad R40e", {
		129	DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
		130	DMI_MATCH(DMI_BIOS_VERSION,"1SET61WW") }, (void*)1},
		131	{ set_max_cstate, "IBM ThinkPad R40e", {
		132	DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
		133	DMI_MATCH(DMI_BIOS_VERSION,"1SET62WW") }, (void*)1},
		134	{ set_max_cstate, "IBM ThinkPad R40e", {
		135	DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
		136	DMI_MATCH(DMI_BIOS_VERSION,"1SET64WW") }, (void*)1},
		137	{ set_max_cstate, "IBM ThinkPad R40e", {
		138	DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
		139	DMI_MATCH(DMI_BIOS_VERSION,"1SET65WW") }, (void*)1},
		140	{ set_max_cstate, "IBM ThinkPad R40e", {
		141	DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
		142	DMI_MATCH(DMI_BIOS_VERSION,"1SET68WW") }, (void*)1},
		143	{ set_max_cstate, "Medion 41700", {
		144	DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"),
		145	DMI_MATCH(DMI_BIOS_VERSION,"R01-A1J")}, (void *)1},
		146	{ set_max_cstate, "Clevo 5600D", {
		147	DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"),
		148	DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")},
114	(void *)2},	149	(void *)2},
115	{},	150	{},
116	};	151	};