powernow-k8 crash workaround, fwd from davej

diff --git a/queue-2.6.16/powernow-k8-crash-workaround.patch b/queue-2.6.16/powernow-k8-crash-workaround.patch
new file mode 100644 (file)
index 0000000..44c90d6
--- /dev/null
+++ b/queue-2.6.16/powernow-k8-crash-workaround.patch
@@ -0,0 +1,46 @@
+From stable-bounces@linux.kernel.org  Sat Jun 10 23:33:22 2006
+Date: Sat, 10 Jun 2006 18:59:23 GMT
+From: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
+To: git-commits-head@vger.kernel.org
+Cc: 
+Subject: powernow-k8 crash workaround
+
+From: Andrew Morton <akpm@osdl.org>
+
+Work around the oops reported in
+http://bugzilla.kernel.org/show_bug.cgi?id=6478.
+
+Thanks to Ralf Hildebrandt <ralf.hildebrandt@charite.de> for testing and
+reporting.
+
+Acked-by: Dave Jones <davej@codemonkey.org.uk>
+Cc: "Brown, Len" <len.brown@intel.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ drivers/acpi/processor_perflib.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- linux-2.6.16.20.orig/drivers/acpi/processor_perflib.c
++++ linux-2.6.16.20/drivers/acpi/processor_perflib.c
+@@ -577,6 +577,8 @@ acpi_processor_register_performance(stru
+               return_VALUE(-EBUSY);
+       }
+ 
++      WARN_ON(!performance);
++
+       pr->performance = performance;
+ 
+       if (acpi_processor_get_performance_info(pr)) {
+@@ -609,7 +611,8 @@ acpi_processor_unregister_performance(st
+               return_VOID;
+       }
+ 
+-      kfree(pr->performance->states);
++      if (pr->performance)
++              kfree(pr->performance->states);
+       pr->performance = NULL;
+ 
+       acpi_cpufreq_remove_file(pr);

diff --git a/queue-2.6.16/series b/queue-2.6.16/series
index bbe173de015ea22a93fe95a2c5aecdf9d9453040..e0b81a963bdf5f293827012c59c94f00110d5c6b 100644 (file)
--- a/queue-2.6.16/series
+++ b/queue-2.6.16/series
@@ -9,3 +9,4 @@ fs-namei.c-call-to-file_permission-under-a-spinlock-in-do_lookup_path.patch
 jfs-fix-multiple-errors-in-metapage_releasepage.patch
 scsi_lib.c-properly-count-the-number-of-pages-in-scsi_req_map_sg.patch
 i2o-bugfixes-to-get-i2o-working-again.patch
+powernow-k8-crash-workaround.patch