diff options
| author | Dave Jones <davej@redhat.com> | 2013-03-06 11:18:56 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2013-03-06 11:18:56 -0500 |
| commit | 674fbccd241415e9f0f62e4295d0bdb0c1340eeb (patch) | |
| tree | e9e1897a59f424d6f78ade0513a6f5c4b8c03d85 | |
| parent | a728032789a96d311fcd847035551599595839e2 (diff) | |
| download | kernel-674fbccd241415e9f0f62e4295d0bdb0c1340eeb.tar.gz kernel-674fbccd241415e9f0f62e4295d0bdb0c1340eeb.tar.xz kernel-674fbccd241415e9f0f62e4295d0bdb0c1340eeb.zip | |
drop acpi debugging patch
| -rw-r--r-- | acpi-debug-infinite-loop.patch | 25 | ||||
| -rw-r--r-- | kernel.spec | 5 |
2 files changed, 3 insertions, 27 deletions
diff --git a/acpi-debug-infinite-loop.patch b/acpi-debug-infinite-loop.patch deleted file mode 100644 index f2cc1a55e..000000000 --- a/acpi-debug-infinite-loop.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- linux-2.6.34.noarch/include/acpi/acconfig.h~ 2010-07-01 14:49:03.000000000 -0400 -+++ linux-2.6.34.noarch/include/acpi/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 */ - ---- 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; diff --git a/kernel.spec b/kernel.spec index 4bd488e10..da19d373a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -641,7 +641,6 @@ Patch110: vmbugon-warnon.patch Patch390: defaults-acpi-video.patch Patch391: acpi-video-dos.patch -Patch394: acpi-debug-infinite-loop.patch Patch396: acpi-sony-nonvs-blacklist.patch Patch450: input-kill-stupid-messages.patch @@ -1322,7 +1321,6 @@ ApplyPatch arm-tegra-usb-no-reset-linux33.patch # ACPI ApplyPatch defaults-acpi-video.patch ApplyPatch acpi-video-dos.patch -ApplyPatch acpi-debug-infinite-loop.patch ApplyPatch acpi-sony-nonvs-blacklist.patch # @@ -2278,6 +2276,9 @@ fi # ||----w | # || || %changelog +* Wed Mar 06 2013 Dave Jones <davej@redhat.com> +- drop acpi debugging patch. + * Wed Mar 06 2013 Justin M. Forbes <jforbes@redhat.com> - Remove Ricoh multifunction DMAR patch as it's no longer needed (rhbz 880051) |