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>

diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c
index 3e04879..37b0e68 100644 (file)
--- 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 (file)
--- 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 */