aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2016-10-17 15:03:19 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-10-20 19:33:39 -0400
commitcacf54750a4204a2d2e49fadce56ef9c739e6b9f (patch)
tree4df61d75837d3973d3a4c5a2ed531f5efb13c2f1
parentb97acdf1b0cd493a8abff703f0674b471bf105b1 (diff)
ACPICA: Increase loop limit for AE_AML_INFINITE_LOOP exception
ACPICA commit 9f83b34cb172549c20f18663bc7460fb4145a75b increase loop limit to accomodate faster processors. From 64k loops max to 1 million. Link: https://github.com/acpica/acpica/commit/9f83b34c Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/acpica/acglobal.h2
-rw-r--r--include/acpi/acconfig.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 750fa824d42c..17f7bb8f9d93 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -242,7 +242,7 @@ ACPI_GLOBAL(struct acpi_thread_state *, acpi_gbl_current_walk_list);
242 242
243/* Maximum number of While() loop iterations before forced abort */ 243/* Maximum number of While() loop iterations before forced abort */
244 244
245ACPI_GLOBAL(u16, acpi_gbl_max_loop_iterations); 245ACPI_GLOBAL(u32, acpi_gbl_max_loop_iterations);
246 246
247/* Control method single step flag */ 247/* Control method single step flag */
248 248
diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index 12c2882bf647..d25da936750e 100644
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -146,7 +146,7 @@
146 146
147/* Maximum number of While() loops before abort */ 147/* Maximum number of While() loops before abort */
148 148
149#define ACPI_MAX_LOOP_COUNT 0xFFFF 149#define ACPI_MAX_LOOP_COUNT 0x000FFFFF
150 150
151/****************************************************************************** 151/******************************************************************************
152 * 152 *