Skip to content

Commit e4c7296

Browse files
committed
resources: Clarify sanity check message
The resource map sanity check message is a bit confusing. Change it to be more readable: -resource map sanity check conflict: 0xfed10000 0xfed15fff 0xfed10000 0xfed13fff pnp 00:01 +resource sanity check: requesting [mem 0xfed10000-0xfed15fff], which spans more than pnp 00:01 [mem 0xfed10000-0xfed13fff] Signed-off-by: Bjorn Helgaas <[email protected]>
1 parent d739a09 commit e4c7296

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

kernel/resource.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1288,13 +1288,10 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size)
12881288
if (p->flags & IORESOURCE_BUSY)
12891289
continue;
12901290

1291-
printk(KERN_WARNING "resource map sanity check conflict: "
1292-
"0x%llx 0x%llx 0x%llx 0x%llx %s\n",
1291+
printk(KERN_WARNING "resource sanity check: requesting [mem %#010llx-%#010llx], which spans more than %s %pR\n",
12931292
(unsigned long long)addr,
12941293
(unsigned long long)(addr + size - 1),
1295-
(unsigned long long)p->start,
1296-
(unsigned long long)p->end,
1297-
p->name);
1294+
p->name, p);
12981295
err = -1;
12991296
break;
13001297
}

0 commit comments

Comments
 (0)