Commit 782492a7 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'acpi-5.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "This corrects a previous attempt to make Linux use its own set of ACPI
  debug flags different from the upstream ACPICA's default (Erik
  Schmauss)"

* tag 'acpi-5.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: use different default debug value than ACPICA
parents 8e377a1c aa9aaa4d
...@@ -1043,9 +1043,6 @@ void __init acpi_early_init(void) ...@@ -1043,9 +1043,6 @@ void __init acpi_early_init(void)
acpi_permanent_mmap = true; acpi_permanent_mmap = true;
/* Initialize debug output. Linux does not use ACPICA defaults */
acpi_dbg_level = ACPI_LV_INFO | ACPI_LV_REPAIR;
#ifdef CONFIG_X86 #ifdef CONFIG_X86
/* /*
* If the machine falls into the DMI check table, * If the machine falls into the DMI check table,
......
...@@ -150,7 +150,10 @@ ...@@ -150,7 +150,10 @@
/* Defaults for debug_level, debug and normal */ /* Defaults for debug_level, debug and normal */
#ifndef ACPI_DEBUG_DEFAULT
#define ACPI_DEBUG_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT | ACPI_LV_EVALUATION | ACPI_LV_REPAIR) #define ACPI_DEBUG_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT | ACPI_LV_EVALUATION | ACPI_LV_REPAIR)
#endif
#define ACPI_NORMAL_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT | ACPI_LV_REPAIR) #define ACPI_NORMAL_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT | ACPI_LV_REPAIR)
#define ACPI_DEBUG_ALL (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL) #define ACPI_DEBUG_ALL (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL)
......
...@@ -82,6 +82,11 @@ ...@@ -82,6 +82,11 @@
#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