diff options
| author | Bob Moore <robert.moore@intel.com> | 2011-02-14 09:02:36 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-03-03 01:38:04 +0100 |
| commit | d59a3c6b35995615fa9e4f21d63fdf21328c5b6b (patch) | |
| tree | 006ee4068d05cca089797f64b09fb6aedfa72cb5 /include/acpi/acoutput.h | |
| parent | ACPICA: Split large utglobal into utdecode.c. (diff) | |
| download | linux-d59a3c6b35995615fa9e4f21d63fdf21328c5b6b.tar.xz linux-d59a3c6b35995615fa9e4f21d63fdf21328c5b6b.zip | |
ACPICA: Fix unresolved name issue for no-debug and no-error-msg cases
The _acpi_module_name was left undefined in these cases, but it
is actually needed as a parameter to some interfaces. Define
_acpi_module_name as a null string in these cases. Acpica BZ 888.
http://www.acpica.org/bugzilla/show_bug.cgi?id=888
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi/acoutput.h')
| -rw-r--r-- | include/acpi/acoutput.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h index ef1cef77d32b..d7bd661bfae7 100644 --- a/include/acpi/acoutput.h +++ b/include/acpi/acoutput.h @@ -183,13 +183,19 @@ #if defined (ACPI_DEBUG_OUTPUT) || !defined (ACPI_NO_ERROR_MESSAGES) /* - * Module name is included in both debug and non-debug versions primarily for - * error messages. The __FILE__ macro is not very useful for this, because it - * often includes the entire pathname to the module + * The module name is used primarily for error and debug messages. + * The __FILE__ macro is not very useful for this, because it + * usually includes the entire pathname to the module making the + * debug output difficult to read. */ #define ACPI_MODULE_NAME(name) static const char ACPI_UNUSED_VAR _acpi_module_name[] = name; #else +/* + * For the no-debug and no-error-msg cases, we must at least define + * a null module name. + */ #define ACPI_MODULE_NAME(name) +#define _acpi_module_name "" #endif /* |