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

Commit b5c0875a authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Utilities: Introduce facility to allow Linux to set correct logging levels 

ACPICA commit 58c9e7b83ae35247e430c39363f55b6f70fa04a2

It is reported that the logging level of the ACPICA messages are not
correct in the Linux kernel. This patch fixes this issue. Lv Zheng.

Link: https://github.com/acpica/acpica/commit/58c9e7b8
Link: https://bugzilla.kernel.org/show_bug.cgi?id=117461


Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 7fdb5cea

drivers/acpi/acpica/acutils.h

+12 −0
Original line number Original line Diff line number Diff line
@@ -114,13 +114,25 @@ extern const char *acpi_gbl_pt_decode[]; 
/*

/*

 * Common error message prefixes

 * Common error message prefixes

 */

 */

#ifndef ACPI_MSG_ERROR

#define ACPI_MSG_ERROR          "ACPI Error: "

#define ACPI_MSG_ERROR          "ACPI Error: "

#endif

#ifndef ACPI_MSG_EXCEPTION

#define ACPI_MSG_EXCEPTION      "ACPI Exception: "

#define ACPI_MSG_EXCEPTION      "ACPI Exception: "

#endif

#ifndef ACPI_MSG_WARNING

#define ACPI_MSG_WARNING        "ACPI Warning: "

#define ACPI_MSG_WARNING        "ACPI Warning: "

#endif

#ifndef ACPI_MSG_INFO

#define ACPI_MSG_INFO           "ACPI: "

#define ACPI_MSG_INFO           "ACPI: "

#endif





#ifndef ACPI_MSG_BIOS_ERROR

#define ACPI_MSG_BIOS_ERROR     "ACPI BIOS Error (bug): "

#define ACPI_MSG_BIOS_ERROR     "ACPI BIOS Error (bug): "

#endif

#ifndef ACPI_MSG_BIOS_WARNING

#define ACPI_MSG_BIOS_WARNING   "ACPI BIOS Warning (bug): "

#define ACPI_MSG_BIOS_WARNING   "ACPI BIOS Warning (bug): "

#endif





/*

/*

 * Common message suffix

 * Common message suffix

include/acpi/platform/aclinux.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -168,6 +168,14 @@ 
#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_next_filename

#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_next_filename

#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_close_directory

#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_close_directory





#define ACPI_MSG_ERROR          KERN_ERR "ACPI Error: "

#define ACPI_MSG_EXCEPTION      KERN_ERR "ACPI Exception: "

#define ACPI_MSG_WARNING        KERN_WARNING "ACPI Warning: "

#define ACPI_MSG_INFO           KERN_INFO "ACPI: "



#define ACPI_MSG_BIOS_ERROR     KERN_ERR "ACPI BIOS Error (bug): "

#define ACPI_MSG_BIOS_WARNING   KERN_WARNING "ACPI BIOS Warning (bug): "



#else				/* !__KERNEL__ */

#else				/* !__KERNEL__ */





#include <stdarg.h>

#include <stdarg.h>