diff options
| author | Bob Moore <robert.moore@intel.com> | 2012-12-31 00:06:50 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-10 12:36:21 +0100 |
| commit | e81a52b8b642aa2322eff10607164b4f24ffd3ae (patch) | |
| tree | 54db4631e13a46ffdd82c09c9d3af8266d3a6190 | |
| parent | 7e2e11abbe54b44c51eeb4f22c19ba7043c3cb88 (diff) | |
| download | op-kernel-dev-e81a52b8b642aa2322eff10607164b4f24ffd3ae.zip op-kernel-dev-e81a52b8b642aa2322eff10607164b4f24ffd3ae.tar.gz | |
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>
| -rw-r--r-- | drivers/acpi/acpica/nsdump.c | 1 | ||||
| -rw-r--r-- | include/acpi/acoutput.h | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c index 3e04879..37b0e68 100644 --- a/drivers/acpi/acpica/nsdump.c +++ b/drivers/acpi/acpica/nsdump.c @@ -44,6 +44,7 @@ #include <acpi/acpi.h> #include "accommon.h" #include "acnamesp.h" +#include <acpi/acoutput.h> #define _COMPONENT ACPI_NAMESPACE ACPI_MODULE_NAME("nsdump") diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h index c13b351..23db272 100644 --- a/include/acpi/acoutput.h +++ b/include/acpi/acoutput.h @@ -266,6 +266,11 @@ #define ACPI_DEBUG_PARAMETERS \ __LINE__, ACPI_GET_FUNCTION_NAME, _acpi_module_name, _COMPONENT +/* Check if debug output is currently dynamically enabled */ + +#define ACPI_IS_DEBUG_ENABLED(level, component) \ + ((level & acpi_dbg_level) && (component & acpi_dbg_layer)) + /* * Master debug print macros * Print message if and only if: @@ -285,9 +290,6 @@ /* Helper macros for DEBUG_PRINT */ -#define ACPI_IS_DEBUG_ENABLED(level, component) \ - ((level & acpi_dbg_level) && (component & acpi_dbg_layer)) - #define ACPI_DEBUG(function, level, line, filename, modulename, component, ...) \ if (ACPI_IS_DEBUG_ENABLED (level, component)) \ { \ @@ -416,6 +418,7 @@ #define ACPI_DUMP_BUFFER(a, b) #define ACPI_DEBUG_PRINT(pl) #define ACPI_DEBUG_PRINT_RAW(pl) +#define ACPI_IS_DEBUG_ENABLED(level, component) 0 /* Return macros must have a return statement at the minimum */ |
