diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 06:58:14 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 06:58:14 -0400 |
commit | 80338681bbc5786fa1342d3b7f021c1d8974ac62 (patch) | |
tree | 90cdacbab0695fcb8b0f5ad9f484e5a5f6751ecf /include/acpi | |
parent | a204dbc61b7f4cb1a7e2cb3ad057b135164782da (diff) | |
parent | 069189a1c8e897be8c9d8f2365c30a6497100519 (diff) |
Merge branch 'acpica'
* acpica: (21 commits)
ACPICA: Update version to 20130517
ACPICA: _CST repair: Handle null package entries
ACPICA: Add several repairs for _CST predefined name
ACPICA: Move _PRT repair into the standard complex repair module
ACPICA: Clear events initialized flag upon event component termination
ACPICA: Fix possible memory leak in GPE init error path
ACPICA: ACPICA Termination: Delete global lock pending lock
ACPICA: Update interface to acpi_ut_valid_acpi_name()
ACPICA: Do not use extended sleep registers unless HW-reduced bit is set
ACPICA: Split table print utilities to a new a separate file
ACPICA: Add option to disable loading of SSDTs from the RSDT/XSDT
ACPICA: Standardize all switch() blocks
ACPICA: Split internal error msg routines to a separate file
ACPICA: Split buffer dump routines into separate file
ACPICA: Update version to 20130418
ACPICA: Update for "orphan" embedded controller _REG method support
ACPICA: Remove unused macros, no functional change
ACPICA: Predefined name support: Remove unused local variable
ACPICA: Add argument typechecking for all predefined ACPI names
ACPICA: Add BIOS error interface for predefined name validation support
...
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/acconfig.h | 4 | ||||
-rw-r--r-- | include/acpi/acoutput.h | 8 | ||||
-rw-r--r-- | include/acpi/acpixf.h | 3 |
3 files changed, 5 insertions, 10 deletions
diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h index 14ceff788c40..1c16f821434f 100644 --- a/include/acpi/acconfig.h +++ b/include/acpi/acconfig.h | |||
@@ -219,8 +219,8 @@ | |||
219 | * | 219 | * |
220 | *****************************************************************************/ | 220 | *****************************************************************************/ |
221 | 221 | ||
222 | #define ACPI_DEBUGGER_MAX_ARGS 8 /* Must be max method args + 1 */ | 222 | #define ACPI_DEBUGGER_MAX_ARGS ACPI_METHOD_NUM_ARGS + 4 /* Max command line arguments */ |
223 | #define ACPI_DB_LINE_BUFFER_SIZE 512 | 223 | #define ACPI_DB_LINE_BUFFER_SIZE 512 |
224 | 224 | ||
225 | #define ACPI_DEBUGGER_COMMAND_PROMPT '-' | 225 | #define ACPI_DEBUGGER_COMMAND_PROMPT '-' |
226 | #define ACPI_DEBUGGER_EXECUTE_PROMPT '%' | 226 | #define ACPI_DEBUGGER_EXECUTE_PROMPT '%' |
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h index 4f52ea795c7a..4607b027a657 100644 --- a/include/acpi/acoutput.h +++ b/include/acpi/acoutput.h | |||
@@ -428,27 +428,21 @@ | |||
428 | * This is the non-debug case -- make everything go away, | 428 | * This is the non-debug case -- make everything go away, |
429 | * leaving no executable debug code! | 429 | * leaving no executable debug code! |
430 | */ | 430 | */ |
431 | #define ACPI_FUNCTION_NAME(a) | ||
432 | #define ACPI_DEBUG_PRINT(pl) | 431 | #define ACPI_DEBUG_PRINT(pl) |
433 | #define ACPI_DEBUG_PRINT_RAW(pl) | 432 | #define ACPI_DEBUG_PRINT_RAW(pl) |
434 | #define ACPI_DEBUG_EXEC(a) | 433 | #define ACPI_DEBUG_EXEC(a) |
435 | #define ACPI_DEBUG_ONLY_MEMBERS(a) | 434 | #define ACPI_DEBUG_ONLY_MEMBERS(a) |
435 | #define ACPI_FUNCTION_NAME(a) | ||
436 | #define ACPI_FUNCTION_TRACE(a) | 436 | #define ACPI_FUNCTION_TRACE(a) |
437 | #define ACPI_FUNCTION_TRACE_PTR(a, b) | 437 | #define ACPI_FUNCTION_TRACE_PTR(a, b) |
438 | #define ACPI_FUNCTION_TRACE_U32(a, b) | 438 | #define ACPI_FUNCTION_TRACE_U32(a, b) |
439 | #define ACPI_FUNCTION_TRACE_STR(a, b) | 439 | #define ACPI_FUNCTION_TRACE_STR(a, b) |
440 | #define ACPI_FUNCTION_EXIT | ||
441 | #define ACPI_FUNCTION_STATUS_EXIT(s) | ||
442 | #define ACPI_FUNCTION_VALUE_EXIT(s) | ||
443 | #define ACPI_FUNCTION_ENTRY() | 440 | #define ACPI_FUNCTION_ENTRY() |
444 | #define ACPI_DUMP_STACK_ENTRY(a) | 441 | #define ACPI_DUMP_STACK_ENTRY(a) |
445 | #define ACPI_DUMP_OPERANDS(a, b, c) | 442 | #define ACPI_DUMP_OPERANDS(a, b, c) |
446 | #define ACPI_DUMP_ENTRY(a, b) | 443 | #define ACPI_DUMP_ENTRY(a, b) |
447 | #define ACPI_DUMP_TABLES(a, b) | ||
448 | #define ACPI_DUMP_PATHNAME(a, b, c, d) | 444 | #define ACPI_DUMP_PATHNAME(a, b, c, d) |
449 | #define ACPI_DUMP_BUFFER(a, b) | 445 | #define ACPI_DUMP_BUFFER(a, b) |
450 | #define ACPI_DEBUG_PRINT(pl) | ||
451 | #define ACPI_DEBUG_PRINT_RAW(pl) | ||
452 | #define ACPI_IS_DEBUG_ENABLED(level, component) 0 | 446 | #define ACPI_IS_DEBUG_ENABLED(level, component) 0 |
453 | 447 | ||
454 | /* Return macros must have a return statement at the minimum */ | 448 | /* Return macros must have a return statement at the minimum */ |
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 454881e6450a..1b09300810e6 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h | |||
@@ -46,7 +46,7 @@ | |||
46 | 46 | ||
47 | /* Current ACPICA subsystem version in YYYYMMDD format */ | 47 | /* Current ACPICA subsystem version in YYYYMMDD format */ |
48 | 48 | ||
49 | #define ACPI_CA_VERSION 0x20130328 | 49 | #define ACPI_CA_VERSION 0x20130517 |
50 | 50 | ||
51 | #include <acpi/acconfig.h> | 51 | #include <acpi/acconfig.h> |
52 | #include <acpi/actypes.h> | 52 | #include <acpi/actypes.h> |
@@ -80,6 +80,7 @@ extern bool acpi_gbl_enable_aml_debug_object; | |||
80 | extern u8 acpi_gbl_copy_dsdt_locally; | 80 | extern u8 acpi_gbl_copy_dsdt_locally; |
81 | extern u8 acpi_gbl_truncate_io_addresses; | 81 | extern u8 acpi_gbl_truncate_io_addresses; |
82 | extern u8 acpi_gbl_disable_auto_repair; | 82 | extern u8 acpi_gbl_disable_auto_repair; |
83 | extern u8 acpi_gbl_disable_ssdt_table_load; | ||
83 | 84 | ||
84 | /* | 85 | /* |
85 | * Hardware-reduced prototypes. All interfaces that use these macros will | 86 | * Hardware-reduced prototypes. All interfaces that use these macros will |