Commit e2dac603 authored by Linus Torvalds's avatar Linus Torvalds

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

Pull ACPI fix from Rafael Wysocki:
 "This prevents excessive ACPI debug messages from being printed to the
  kernel log, which has started to happen after one of the recent ACPICA
  commits (Erik Schmauss)"

* tag 'acpi-5.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: Set debug output flags independent of ACPICA
parents 27b4ad62 ce5cbf53
...@@ -1029,6 +1029,9 @@ void __init acpi_early_init(void) ...@@ -1029,6 +1029,9 @@ 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,
......
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