diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-03-28 15:15:32 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-03-28 17:22:32 -0400 |
| commit | db49e9edd88a3f41e7c5f249c26583c579a41bb1 (patch) | |
| tree | 8aa40ec5918044c135000a68524ddee9da2172a3 /linux-2.6-acpi-debug-infinite-loop.patch | |
| parent | 561c61e4ca69b9f215c5f476aea5e78928fe4af1 (diff) | |
| download | kernel-db49e9edd88a3f41e7c5f249c26583c579a41bb1.tar.gz kernel-db49e9edd88a3f41e7c5f249c26583c579a41bb1.tar.xz kernel-db49e9edd88a3f41e7c5f249c26583c579a41bb1.zip | |
update to snapshot 2.6.38-git19
Diffstat (limited to 'linux-2.6-acpi-debug-infinite-loop.patch')
| -rw-r--r-- | linux-2.6-acpi-debug-infinite-loop.patch | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/linux-2.6-acpi-debug-infinite-loop.patch b/linux-2.6-acpi-debug-infinite-loop.patch index 45cb05165..d20025224 100644 --- a/linux-2.6-acpi-debug-infinite-loop.patch +++ b/linux-2.6-acpi-debug-infinite-loop.patch @@ -1,16 +1,3 @@ ---- 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 @@ @@ -22,3 +9,17 @@ /* Maximum sleep allowed via Sleep() operator */ +--- a/drivers/acpi/acpica/dscontrol.c ++++ b/drivers/acpi/acpica/dscontrol.c +@@ -212,6 +212,11 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state, + * 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; |