Skip to content

Commit

Permalink
ACPICA: Update for non-configured ACPI_IS_DEBUG_ENABLED macro.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bob Moore authored and Rafael J. Wysocki committed Jan 10, 2013
1 parent 7e2e11a commit e81a52b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions drivers/acpi/acpica/nsdump.c
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
9 changes: 6 additions & 3 deletions include/acpi/acoutput.h
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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)) \
{ \
Expand Down Expand Up @@ -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 */

Expand Down

0 comments on commit e81a52b

Please sign in to comment.