diff options
author | Bob Moore <robert.moore@intel.com> | 2012-12-30 19:06:50 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-10 06:36:21 -0500 |
commit | e81a52b8b642aa2322eff10607164b4f24ffd3ae (patch) | |
tree | 54db4631e13a46ffdd82c09c9d3af8266d3a6190 /include/acpi | |
parent | 7e2e11abbe54b44c51eeb4f22c19ba7043c3cb88 (diff) |
ACPICA: Update for non-configured ACPI_IS_DEBUG_ENABLED macro.
Also add acoutput.h to the nsdump.c file.
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>
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/acoutput.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h index c13b351a254d..23db272e0bff 100644 --- a/include/acpi/acoutput.h +++ b/include/acpi/acoutput.h | |||
@@ -266,6 +266,11 @@ | |||
266 | #define ACPI_DEBUG_PARAMETERS \ | 266 | #define ACPI_DEBUG_PARAMETERS \ |
267 | __LINE__, ACPI_GET_FUNCTION_NAME, _acpi_module_name, _COMPONENT | 267 | __LINE__, ACPI_GET_FUNCTION_NAME, _acpi_module_name, _COMPONENT |
268 | 268 | ||
269 | /* Check if debug output is currently dynamically enabled */ | ||
270 | |||
271 | #define ACPI_IS_DEBUG_ENABLED(level, component) \ | ||
272 | ((level & acpi_dbg_level) && (component & acpi_dbg_layer)) | ||
273 | |||
269 | /* | 274 | /* |
270 | * Master debug print macros | 275 | * Master debug print macros |
271 | * Print message if and only if: | 276 | * Print message if and only if: |
@@ -285,9 +290,6 @@ | |||
285 | 290 | ||
286 | /* Helper macros for DEBUG_PRINT */ | 291 | /* Helper macros for DEBUG_PRINT */ |
287 | 292 | ||
288 | #define ACPI_IS_DEBUG_ENABLED(level, component) \ | ||
289 | ((level & acpi_dbg_level) && (component & acpi_dbg_layer)) | ||
290 | |||
291 | #define ACPI_DEBUG(function, level, line, filename, modulename, component, ...) \ | 293 | #define ACPI_DEBUG(function, level, line, filename, modulename, component, ...) \ |
292 | if (ACPI_IS_DEBUG_ENABLED (level, component)) \ | 294 | if (ACPI_IS_DEBUG_ENABLED (level, component)) \ |
293 | { \ | 295 | { \ |
@@ -416,6 +418,7 @@ | |||
416 | #define ACPI_DUMP_BUFFER(a, b) | 418 | #define ACPI_DUMP_BUFFER(a, b) |
417 | #define ACPI_DEBUG_PRINT(pl) | 419 | #define ACPI_DEBUG_PRINT(pl) |
418 | #define ACPI_DEBUG_PRINT_RAW(pl) | 420 | #define ACPI_DEBUG_PRINT_RAW(pl) |
421 | #define ACPI_IS_DEBUG_ENABLED(level, component) 0 | ||
419 | 422 | ||
420 | /* Return macros must have a return statement at the minimum */ | 423 | /* Return macros must have a return statement at the minimum */ |
421 | 424 | ||