rpms/kernel/devel linux-2.6-acpi-debug-infinite-loop.patch, NONE, 1.1 kernel.spec, 1.2058, 1.2059

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7843

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-acpi-debug-infinite-loop.patch 
Log Message:
Add a patch to debug an infinite loop warning from acpi.

linux-2.6-acpi-debug-infinite-loop.patch:
 acconfig.h |    2 +-
 dsopcode.c |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-acpi-debug-infinite-loop.patch ---
--- linux-2.6.34.noarch/drivers/acpi/acpica/dsopcode.c~	2010-07-01 14:40:44.000000000 -0400
+++ linux-2.6.34.noarch/drivers/acpi/acpica/dsopcode.c	2010-07-01 14:48:56.000000000 -0400
@@ -1276,6 +1276,10 @@ acpi_ds_exec_end_control_op(struct acpi_
 			 * loop does not implement a timeout.
 			 */
 			control_state->control.loop_count++;
+			if ((control_state->control.loop_count > 1) && (control_state->control.loop_count % 0xffff == 0))
+				printk("ACPI: While loop taking a really long time. loop_count=0x%x\n",
+					control_state->control.loop_count);
+
 			if (control_state->control.loop_count >
 				ACPI_MAX_LOOP_ITERATIONS) {
 				status = AE_AML_INFINITE_LOOP;
--- linux-2.6.34.noarch/drivers/acpi/acpica/acconfig.h~	2010-07-01 14:49:03.000000000 -0400
+++ linux-2.6.34.noarch/drivers/acpi/acpica/acconfig.h	2010-07-01 14:49:17.000000000 -0400
@@ -117,7 +117,7 @@
 
 /* Maximum number of While() loop iterations before forced abort */
 
-#define ACPI_MAX_LOOP_ITERATIONS        0xFFFF
+#define ACPI_MAX_LOOP_ITERATIONS        0xFFFFFF
 
 /* Maximum sleep allowed via Sleep() operator */
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2058
retrieving revision 1.2059
diff -u -p -r1.2058 -r1.2059
--- kernel.spec	1 Jul 2010 18:42:10 -0000	1.2058
+++ kernel.spec	1 Jul 2010 18:52:36 -0000	1.2059
@@ -625,6 +625,7 @@ Patch383: linux-2.6-defaults-aspm.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
 Patch393: acpi-ec-add-delay-before-write.patch
+Patch394: linux-2.6-acpi-debug-infinite-loop.patch
 
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch452: linux-2.6.30-no-pcspkr-modalias.patch
@@ -1155,6 +1156,7 @@ ApplyPatch linux-2.6-ext4-fix-freeze-dea
 ApplyPatch linux-2.6-defaults-acpi-video.patch
 ApplyPatch linux-2.6-acpi-video-dos.patch
 ApplyPatch acpi-ec-add-delay-before-write.patch
+ApplyPatch linux-2.6-acpi-debug-infinite-loop.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1890,6 +1892,9 @@ fi
 
 %changelog
 * Thu Jul 01 2010 Dave Jones <davej at redhat.com>
+- Add a patch to debug an infinite loop warning from acpi.
+
+* Thu Jul 01 2010 Dave Jones <davej at redhat.com>
 - 2.6.35-rc3-git5
 
 * Thu Jul 01 2010 Chuck Ebbert <cebbert at redhat.com>