Commit b9bfb671 authored by Erik Schmauss's avatar Erik Schmauss Committed by Greg Kroah-Hartman

ACPICA: Linux: move ACPI_DEBUG_DEFAULT flag out of ifndef

commit 11207b4d upstream.

ACPICA commit c14f17fa0acf8c93497ce04b9a7f4ada51b69383

This flag should not be included in #ifndef CONFIG_ACPI. It should be
used unconditionally.

Link: https://github.com/acpica/acpica/commit/c14f17fa
Fixes: aa9aaa4d ("ACPI: use different default debug value than ACPICA")
Reported-by: default avatarGabriel C <nix.or.die@gmail.com>
Tested-by: default avatarGabriel C <nix.or.die@gmail.com>
Signed-off-by: default avatarErik Schmauss <erik.schmauss@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Cc: 5.1+ <stable@vger.kernel.org> 5.1+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 707edfd5
...@@ -66,6 +66,11 @@ ...@@ -66,6 +66,11 @@
#define ACPI_INIT_FUNCTION __init #define ACPI_INIT_FUNCTION __init
/* Use a specific bugging default separate from ACPICA */
#undef ACPI_DEBUG_DEFAULT
#define ACPI_DEBUG_DEFAULT (ACPI_LV_INFO | ACPI_LV_REPAIR)
#ifndef CONFIG_ACPI #ifndef CONFIG_ACPI
/* External globals for __KERNEL__, stubs is needed */ /* External globals for __KERNEL__, stubs is needed */
...@@ -82,11 +87,6 @@ ...@@ -82,11 +87,6 @@
#define ACPI_NO_ERROR_MESSAGES #define ACPI_NO_ERROR_MESSAGES
#undef ACPI_DEBUG_OUTPUT #undef ACPI_DEBUG_OUTPUT
/* Use a specific bugging default separate from ACPICA */
#undef ACPI_DEBUG_DEFAULT
#define ACPI_DEBUG_DEFAULT (ACPI_LV_INFO | ACPI_LV_REPAIR)
/* External interface for __KERNEL__, stub is needed */ /* External interface for __KERNEL__, stub is needed */
#define ACPI_EXTERNAL_RETURN_STATUS(prototype) \ #define ACPI_EXTERNAL_RETURN_STATUS(prototype) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment