ACPI: fix resource check message (106d1a0a) · Commits · 戴 / test

printk("%pR",...) is for formatting struct resource only. But the list built up in drivers/acpi/osl.c uses it's own struct: struct acpi_res_list {} Without this patch you can see wrongly formatted resources (SMRG is of IO type): ACPI: resource 0000:00:1f.3 [io 0x0400-0x041f] conflicts with AC PI region SMRG [mem 0x00000400-0x0000040f 64bit pref disabled] https://bugzilla.kernel.org/show_bug.cgi?id=26342 Signed-off-by:

Thomas Renninger <trenn@suse.de> CC: Matthew Wilcox <matthew@wil.cx> Signed-off-by:

Len Brown <len.brown@intel.com>

drivers/acpi/osl.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -1192,8 +1192,7 @@ __setup("acpi_enforce_resources=", acpi_enforce_resources_setup);
		int acpi_check_resource_conflict(const struct resource *res)
		{
		struct acpi_res_list *res_list_elem;
		int ioport;
		int clash = 0;
		int ioport = 0, clash = 0;

		if (acpi_enforce_resources == ENFORCE_RESOURCES_NO)
		return 0;
		@@ -1223,9 +1222,13 @@ int acpi_check_resource_conflict(const struct resource *res)
		if (clash) {
		if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) {
		printk(KERN_WARNING "ACPI: resource %s %pR"
		" conflicts with ACPI region %s %pR\n",
		" conflicts with ACPI region %s "
		"[%s 0x%zx-0x%zx]\n",
		res->name, res, res_list_elem->name,
		res_list_elem);
		(res_list_elem->resource_type ==
		ACPI_ADR_SPACE_SYSTEM_IO) ? "io" : "mem",
		(size_t) res_list_elem->start,
		(size_t) res_list_elem->end);
		if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX)
		printk(KERN_NOTICE "ACPI: This conflict may"
		" cause random problems and system"

Admin message