rpms/kernel/devel linux-2.6-acpi-thinkpad-c2c3.patch,1.1,1.2

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Jan 6 06:35:34 UTC 2006


Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18002

Modified Files:
	linux-2.6-acpi-thinkpad-c2c3.patch 
Log Message:
A few extra systems


linux-2.6-acpi-thinkpad-c2c3.patch:
 processor_idle.c |   67 +++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 51 insertions(+), 16 deletions(-)

Index: linux-2.6-acpi-thinkpad-c2c3.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-acpi-thinkpad-c2c3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-acpi-thinkpad-c2c3.patch	16 Oct 2005 22:23:45 -0000	1.1
+++ linux-2.6-acpi-thinkpad-c2c3.patch	6 Jan 2006 06:35:31 -0000	1.2
@@ -1,16 +1,30 @@
-processor_idle.c vs Lindent resulted in something of a trainwreck
-with whitespace all over the place.  This diff rearranges teh
-processor_power_dmi_table to look like it did before that accident,
-and adds two additional BIOS's to the list as encountered by
-Fedora users.
 
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=165590
 
-Signed-off-by: Dave Jones <davej at redhat.com>
 
---- linux-2.6.13/drivers/acpi/processor_idle.c~	2005-09-09 19:24:25.000000000 -0400
-+++ linux-2.6.13/drivers/acpi/processor_idle.c	2005-09-09 19:33:18.000000000 -0400
-@@ -94,22 +94,27 @@ static int set_max_cstate(struct dmi_sys
+From: Thomas Rosner <kernel-bugs at digital-trauma.de>
+
+This adds all known BIOS versions of IBM R40e Laptops to the C2/C3
+processor state blacklist and thus prevents them from crashing.  Fixes Bug
+#3549.
+
+Implementation is probably overly verbose, but DMI_MATCH seems to give us
+no choice.
+
+Signed-off-by: Thomas Rosner <kernel-bugs at digital-trauma.de>
+Cc: <linux-acpi at intel.com>
+Cc: "Brown, Len" <len.brown at intel.com>
+Cc: Dave Jones <davej at redhat.com>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+---
+
+ drivers/acpi/processor_idle.c |   67 ++++++++++++++++++++++++--------
+ 1 files changed, 51 insertions(+), 16 deletions(-)
+
+diff -puN drivers/acpi/processor_idle.c~acpi-disable-c2-c3-for-_all_-ibm-r40e-laptops-for-2613-bug-3549 drivers/acpi/processor_idle.c
+--- devel/drivers/acpi/processor_idle.c~acpi-disable-c2-c3-for-_all_-ibm-r40e-laptops-for-2613-bug-3549	2006-01-05 22:28:12.000000000 -0800
++++ devel-akpm/drivers/acpi/processor_idle.c	2006-01-05 22:28:12.000000000 -0800
+@@ -95,22 +95,57 @@ static int set_max_cstate(struct dmi_sys
  }
  
  static struct dmi_system_id __initdata processor_power_dmi_table[] = {
@@ -19,35 +33,70 @@
 -							 "IBM"),
 -					       DMI_MATCH(DMI_BIOS_VERSION,
 -							 "1SET60WW")},
-+	{ 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,"1SET68WW") },
-+	 (void*)1},
-+
- 	{set_max_cstate, "Medion 41700", {
+-	 (void *)1},
+-	{set_max_cstate, "Medion 41700", {
 -					  DMI_MATCH(DMI_BIOS_VENDOR,
 -						    "Phoenix Technologies LTD"),
 -					  DMI_MATCH(DMI_BIOS_VERSION,
 -						    "R01-A1J")}, (void *)1},
-+	 DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
-+	 DMI_MATCH(DMI_BIOS_VERSION, "R01-A1J")},
-+	 (void *)1},
-+
- 	{set_max_cstate, "Clevo 5600D", {
+-	{set_max_cstate, "Clevo 5600D", {
 -					 DMI_MATCH(DMI_BIOS_VENDOR,
 -						   "Phoenix Technologies LTD"),
 -					 DMI_MATCH(DMI_BIOS_VERSION,
 -						   "SHE845M0.86C.0013.D.0302131307")},
-+	 DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
-+	 DMI_MATCH(DMI_BIOS_VERSION, "SHE845M0.86C.0013.D.0302131307")},
++	{ 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,"1SET43WW") }, (void*)1},
++	{ set_max_cstate, "IBM ThinkPad R40e", {
++	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
++	  DMI_MATCH(DMI_BIOS_VERSION,"1SET45WW") }, (void*)1},
++	{ set_max_cstate, "IBM ThinkPad R40e", {
++	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
++	  DMI_MATCH(DMI_BIOS_VERSION,"1SET47WW") }, (void*)1},
++	{ set_max_cstate, "IBM ThinkPad R40e", {
++	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
++	  DMI_MATCH(DMI_BIOS_VERSION,"1SET50WW") }, (void*)1},
++	{ 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},
  	{},
  };
+_
+




More information about the fedora-cvs-commits mailing list