Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/acpi/bus.c

+0 −3
Original line number Diff line number Diff line
@@ -1043,9 +1043,6 @@ void __init acpi_early_init(void) 


	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

	/*

	 * If the machine falls into the DMI check table,

include/acpi/acoutput.h

+3 −0
Original line number Diff line number Diff line
@@ -150,7 +150,10 @@ 


/* 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)

#endif



#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)

include/acpi/platform/aclinux.h

+5 −0
Original line number Diff line number Diff line
@@ -82,6 +82,11 @@ 
#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) \