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

Commit 1638bca8 authored by Chase Douglas's avatar Chase Douglas Committed by Len Brown
Browse files

ACPI: Reduce ACPI resource conflict message to KERN_WARNING, printk cleanup 



By default, ACPI resource conflict messages are logged at level
KERN_ERR. This is a rather high level for a message that is more a
warning than an indication of a real kernel error. Also, KERN_ERR level
messages can appear over some boot splash screens, and this message is
not serious enough to warrant such treatment. Thus, the log level has
been reduced to KERN_WARNING.

[lenb changed to KERN_WARNING rather than all the way to KERN_INFO]

Also, cleanup message to use %pR resource printing format.

Signed-off-by: default avatarChase Douglas <chase.douglas@canonical.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 2eaa9cfd

drivers/acpi/osl.c

+4 −10
Original line number Diff line number Diff line
@@ -1151,16 +1151,10 @@ int acpi_check_resource_conflict(const struct resource *res) 


	if (clash) {

		if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) {

			printk("%sACPI: %s resource %s [0x%llx-0x%llx]"

			       " conflicts with ACPI region %s"

			       " [0x%llx-0x%llx]\n",

			       acpi_enforce_resources == ENFORCE_RESOURCES_LAX

			       ? KERN_WARNING : KERN_ERR,

			       ioport ? "I/O" : "Memory", res->name,

			       (long long) res->start, (long long) res->end,

			       res_list_elem->name,

			       (long long) res_list_elem->start,

			       (long long) res_list_elem->end);

			printk(KERN_WARNING "ACPI: resource %s %pR"

			       " conflicts with ACPI region %s %pR\n",

			       res->name, res, res_list_elem->name,

			       res_list_elem);

			if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX)

				printk(KERN_NOTICE "ACPI: This conflict may"

				       " cause random problems and system"