rpms/kernel/FC-4 .cvsignore, 1.154, 1.155 kernel-2.6.spec, 1.1413, 1.1414 linux-2.6.11-acpi-thinkpad-c2c3.patch, 1.2, 1.3 sources, 1.138, 1.139

Fri Aug 5 22:15:00 UTC 2005

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec 
	linux-2.6.11-acpi-thinkpad-c2c3.patch sources 
Log Message:
update acpi.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155

--- .cvsignore	3 Aug 2005 21:14:45 -0000	1.154
+++ .cvsignore	5 Aug 2005 22:14:57 -0000	1.155
@@ -7,3 +7,4 @@
 kernel-2.6.12
 linux-2.6.12.tar.bz2
 patch-2.6.12.3.bz2
+linux-2.6-acpi-20050729.patch.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1413
retrieving revision 1.1414
diff -u -r1.1413 -r1.1414
--- kernel-2.6.spec	5 Aug 2005 22:03:52 -0000	1.1413
+++ kernel-2.6.spec	5 Aug 2005 22:14:57 -0000	1.1414
@@ -328,7 +328,6 @@
 Patch1610: linux-2.6.11-atkbd-dell-multimedia.patch
 Patch1620: linux-2.6.11-isdn-icn-nodev.patch
 Patch1640: linux-2.6.11-panic-stackdump.patch
-Patch1650: linux-2.6.11-acpi-thinkpad-c2c3.patch
 Patch1700: linux-2.6.10-revert-module-invalidparam.patch
 Patch1710: linux-2.6.12rc-ac-ide-fixes.patch
 Patch1711: linux-2.6-ide-tune-locking.patch
@@ -350,7 +349,6 @@
 Patch1890: linux-2.6.12-firedire-init-breakage.patch 
 Patch1900: linux-2.6.12-pwc-warning.patch
 Patch1910: linux-2.6.12-ns558-nodev-rmmod.patch
-Patch1920: linux-2.6.12-acpi-legacy-irq.patch
 Patch1930: linux-2.6-appletouch-update.patch
 Patch1950: linux-2.6-selinux-addrlen-checks.patch
 
@@ -358,6 +356,9 @@
 Patch2001: linux-2.6.9-vm-oomkiller-debugging.patch
 Patch2002: linux-2.6.12-vm-singlebiterror.patch
 
+Patch2100: linux-2.6-acpi-20050729.patch.bz2
+Patch2110: linux-2.6.11-acpi-thinkpad-c2c3.patch
+
 Patch2999: linux-2.6.3-printopen.patch
 
 #
@@ -768,8 +769,6 @@
 %patch1620 -p1
 # Print stack trace when we panic.
 %patch1640 -p1
-# Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS.
-%patch1650 -p1
 # Don't barf on obsolete module parameters.
 %patch1700 -p1
 # Numerous IDE fixes.
@@ -827,6 +826,11 @@
 %patch2002 -p1
 
 
+# ACPI update.
+%patch2100 -p1
+# Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS.
+%patch2110 -p1
+
 #
 # Local hack (off for any shipped kernels) to printk all files opened 
 # the first 180 seconds after boot for debugging userspace startup 
@@ -1277,6 +1281,7 @@
 %changelog
 * Fri Aug  5 2005 Dave Jones <davej at redhat.com>
 - update to final 2.6.12.4 patchset.
+- ACPI update to 20050729.
 
 * Thu Aug  4 2005 Dave Jones <davej at redhat.com>
 - Enable Amiga partition support. (#149802)

linux-2.6.11-acpi-thinkpad-c2c3.patch:
 processor_idle.c |    3 +++
 1 files changed, 3 insertions(+)

Index: linux-2.6.11-acpi-thinkpad-c2c3.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6.11-acpi-thinkpad-c2c3.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.11-acpi-thinkpad-c2c3.patch	27 Jun 2005 20:53:43 -0000	1.2
+++ linux-2.6.11-acpi-thinkpad-c2c3.patch	5 Aug 2005 22:14:57 -0000	1.3
@@ -1,83 +1,12 @@
-
-The patch titled
-
-     ] acpi: Disable C2/C3 for _all_ IBM R40e Laptops (Bug #3549)
-
-has been added to the -mm tree.  Its filename is
-
-     acpi-disable-c2-c3-for-_all_-ibm-r40e-laptops-bug-3549.patch
-
-Patches currently in -mm which might be from Thomas.Roesner at digital-trauma.de are
-
-acpi-disable-c2-c3-for-_all_-ibm-r40e-laptops-bug-3549.patch
-
-
-
-From: Thomas Roesner <Thomas.Roesner 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 Roesner <kernel-bugs at digital-trauma.de>
-Cc: "Brown, Len" <len.brown at intel.com>
-Signed-off-by: Andrew Morton <akpm at osdl.org>
----
-
- drivers/acpi/processor_idle.c |   39 +++++++++++++++++++++++++++++++++++++++
- 1 files changed, 39 insertions(+)
-
-diff -puN drivers/acpi/processor_idle.c~acpi-disable-c2-c3-for-_all_-ibm-r40e-laptops-bug-3549 drivers/acpi/processor_idle.c
---- 25/drivers/acpi/processor_idle.c~acpi-disable-c2-c3-for-_all_-ibm-r40e-laptops-bug-3549	Mon Jun 27 13:40:24 2005
-+++ 25-akpm/drivers/acpi/processor_idle.c	Mon Jun 27 13:41:08 2005
-@@ -99,7 +99,46 @@ static int no_c2c3(struct dmi_system_id 
- static struct dmi_system_id __initdata processor_power_dmi_table[] = {
- 	{ no_c2c3, "IBM ThinkPad R40e", {
+--- linux-2.6.12/drivers/acpi/processor_idle.c~	2005-08-01 00:26:50.000000000 -0400
++++ linux-2.6.12/drivers/acpi/processor_idle.c	2005-08-01 00:27:53.000000000 -0400
+@@ -101,6 +101,9 @@ static struct dmi_system_id __initdata p
+ 	{ set_max_cstate, "IBM ThinkPad R40e", {
  	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-+	  DMI_MATCH(DMI_BIOS_VERSION,"1SET32WW") }},
-+	{ no_c2c3, "IBM ThinkPad R40e", {
+ 	  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") }},
-+	{ no_c2c3, "IBM ThinkPad R40e", {
-+	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-+	  DMI_MATCH(DMI_BIOS_VERSION,"1SET45WW") }},
-+	{ no_c2c3, "IBM ThinkPad R40e", {
-+	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-+	  DMI_MATCH(DMI_BIOS_VERSION,"1SET47WW") }},
-+	{ no_c2c3, "IBM ThinkPad R40e", {
-+	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-+	  DMI_MATCH(DMI_BIOS_VERSION,"1SET50WW") }},
-+	{ no_c2c3, "IBM ThinkPad R40e", {
-+	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-+	  DMI_MATCH(DMI_BIOS_VERSION,"1SET52WW") }},
-+	{ no_c2c3, "IBM ThinkPad R40e", {
-+	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-+	  DMI_MATCH(DMI_BIOS_VERSION,"1SET55WW") }},
-+	{ no_c2c3, "IBM ThinkPad R40e", {
-+	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-+	  DMI_MATCH(DMI_BIOS_VERSION,"1SET56WW") }},
-+	{ no_c2c3, "IBM ThinkPad R40e", {
-+	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-+	  DMI_MATCH(DMI_BIOS_VERSION,"1SET59WW") }},
-+	{ no_c2c3, "IBM ThinkPad R40e", {
-+	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
- 	  DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW") }},
-+	{ no_c2c3, "IBM ThinkPad R40e", {
-+	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-+	  DMI_MATCH(DMI_BIOS_VERSION,"1SET61WW") }},
-+	{ no_c2c3, "IBM ThinkPad R40e", {
-+	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-+	  DMI_MATCH(DMI_BIOS_VERSION,"1SET62WW") }},
-+	{ no_c2c3, "IBM ThinkPad R40e", {
-+	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-+	  DMI_MATCH(DMI_BIOS_VERSION,"1SET64WW") }},
-+	{ no_c2c3, "IBM ThinkPad R40e", {
-+	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-+	  DMI_MATCH(DMI_BIOS_VERSION,"1SET65WW") }},
- 	{ no_c2c3, "Medion 41700", {
++	  DMI_MATCH(DMI_BIOS_VERSION,"1SET61WW") }, (void*)1},
+ 	{ set_max_cstate, "Medion 41700", {
  	  DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"),
- 	  DMI_MATCH(DMI_BIOS_VERSION,"R01-A1J") }},
-
+ 	  DMI_MATCH(DMI_BIOS_VERSION,"R01-A1J") }, (void*)1},


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- sources	3 Aug 2005 21:14:45 -0000	1.138
+++ sources	5 Aug 2005 22:14:57 -0000	1.139
@@ -1,2 +1,3 @@
 c5d2a1b62e1dad502c871bba267337d5  linux-2.6.12.tar.bz2
 de686bce6c9c79222632d3ead17742ea  patch-2.6.12.3.bz2
+36a0aef15ffc4857b3ca0f8c4cf4e916  linux-2.6-acpi-20050729.patch.bz2


