aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Renninger <trenn@suse.de>2010-12-20 06:11:45 -0500
committerLen Brown <len.brown@intel.com>2011-01-12 12:16:05 -0500
commit106d1a0ab2a354b97df3e232be7dedbfaf8e901d (patch)
treeaa5029d83b5e33e2b9913949e0771f4664a0414e
parent5b275ce27077d6463ca28c9671dce7c2c1f622e2 (diff)
ACPI: fix resource check message
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>
-rw-r--r--drivers/acpi/osl.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 966feddf6b1b..6eaa13cdf767 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1192,8 +1192,7 @@ __setup("acpi_enforce_resources=", acpi_enforce_resources_setup);
1192int acpi_check_resource_conflict(const struct resource *res) 1192int acpi_check_resource_conflict(const struct resource *res)
1193{ 1193{
1194 struct acpi_res_list *res_list_elem; 1194 struct acpi_res_list *res_list_elem;
1195 int ioport; 1195 int ioport = 0, clash = 0;
1196 int clash = 0;
1197 1196
1198 if (acpi_enforce_resources == ENFORCE_RESOURCES_NO) 1197 if (acpi_enforce_resources == ENFORCE_RESOURCES_NO)
1199 return 0; 1198 return 0;
@@ -1223,9 +1222,13 @@ int acpi_check_resource_conflict(const struct resource *res)
1223 if (clash) { 1222 if (clash) {
1224 if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) { 1223 if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) {
1225 printk(KERN_WARNING "ACPI: resource %s %pR" 1224 printk(KERN_WARNING "ACPI: resource %s %pR"
1226 " conflicts with ACPI region %s %pR\n", 1225 " conflicts with ACPI region %s "
1226 "[%s 0x%zx-0x%zx]\n",
1227 res->name, res, res_list_elem->name, 1227 res->name, res, res_list_elem->name,
1228 res_list_elem); 1228 (res_list_elem->resource_type ==
1229 ACPI_ADR_SPACE_SYSTEM_IO) ? "io" : "mem",
1230 (size_t) res_list_elem->start,
1231 (size_t) res_list_elem->end);
1229 if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX) 1232 if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX)
1230 printk(KERN_NOTICE "ACPI: This conflict may" 1233 printk(KERN_NOTICE "ACPI: This conflict may"
1231 " cause random problems and system" 1234 " cause random problems and system"