diff options
| author | Erik Schmauss <erik.schmauss@intel.com> | 2019-05-10 20:25:42 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-22 08:39:51 +0300 |
| commit | b9bfb6719df2a462af2bd511e01bbbe9eebdeebf (patch) | |
| tree | 81eedb69315426e1f3a80f464779725c59efc3cd /include | |
| parent | 707edfd5e1a18d1649f5e4d0b0bfbf5212397a4f (diff) | |
| download | linux-b9bfb6719df2a462af2bd511e01bbbe9eebdeebf.tar.xz | |
ACPICA: Linux: move ACPI_DEBUG_DEFAULT flag out of ifndef
commit 11207b4dc2737f1f01695979ad5eac6c8ecc8031 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: aa9aaa4d61c0 ("ACPI: use different default debug value than ACPICA")
Reported-by: Gabriel C <nix.or.die@gmail.com>
Tested-by: Gabriel C <nix.or.die@gmail.com>
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Cc: 5.1+ <stable@vger.kernel.org> 5.1+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/platform/aclinux.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 624b90b34085..310501994c02 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -66,6 +66,11 @@ #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 /* External globals for __KERNEL__, stubs is needed */ @@ -82,11 +87,6 @@ #define ACPI_NO_ERROR_MESSAGES #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 */ #define ACPI_EXTERNAL_RETURN_STATUS(prototype) \ |