Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 17:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACPI: fix resource check message

Browse Source 
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>
This commit is contained in:
Thomas Renninger 2010-12-20 12:11:45 +01:00 committed by Len Brown
parent 5b275ce270
commit 106d1a0ab2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/acpi/osl.c
View File

@ -1192,8 +1192,7 @@ __setup("acpi_enforce_resources=", acpi_enforce_resources_setup);
int acpi_check_resource_conflict(const struct resource *res) int acpi_check_resource_conflict(const struct resource *res)
{ {
struct acpi_res_list *res_list_elem; struct acpi_res_list *res_list_elem;
int ioport; int ioport = 0, clash = 0;
int clash = 0;
if (acpi_enforce_resources == ENFORCE_RESOURCES_NO) if (acpi_enforce_resources == ENFORCE_RESOURCES_NO)
return 0; return 0;
@ -1223,9 +1222,13 @@ int acpi_check_resource_conflict(const struct resource *res)
if (clash) { if (clash) {
if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) { if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) {
printk(KERN_WARNING "ACPI: resource %s %pR" 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->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) if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX)
printk(KERN_NOTICE "ACPI: This conflict may" printk(KERN_NOTICE "ACPI: This conflict may"
" cause random problems and system" " cause random problems and system"