diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-12-01 14:24:54 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-12-01 14:24:54 +0100 |
| commit | d0ab6714c53c9d7f3e42b7ea2e108afbd7449305 (patch) | |
| tree | cbc41759898f3e29f58564e6eff48e58aa94217c /include/acpi | |
| parent | e2174b0c24caca170ca61eda2ae49c9561ff8896 (diff) | |
| parent | 69d4e425d218e866e4cf3d34099691e9bcde0209 (diff) | |
| download | linux-d0ab6714c53c9d7f3e42b7ea2e108afbd7449305.tar.bz2 | |
Merge back earlier ACPICA material for v4.10.
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acconfig.h | 2 | ||||
| -rw-r--r-- | include/acpi/acpixf.h | 9 |
2 files changed, 9 insertions, 2 deletions
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 @@ /* Maximum number of While() loops before abort */ -#define ACPI_MAX_LOOP_COUNT 0xFFFF +#define ACPI_MAX_LOOP_COUNT 0x000FFFFF /****************************************************************************** * diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index c7b3a132dbe7..5c7356adc10b 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20160831 +#define ACPI_CA_VERSION 0x20160930 #include <acpi/acconfig.h> #include <acpi/actypes.h> @@ -259,6 +259,13 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_osi_data, 0); ACPI_INIT_GLOBAL(u8, acpi_gbl_reduced_hardware, FALSE); /* + * Maximum number of While() loop iterations before forced method abort. + * This mechanism is intended to prevent infinite loops during interpreter + * execution within a host kernel. + */ +ACPI_INIT_GLOBAL(u32, acpi_gbl_max_loop_iterations, ACPI_MAX_LOOP_COUNT); + +/* * This mechanism is used to trace a specified AML method. The method is * traced each time it is executed. */ |