diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-04-14 15:38:11 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-23 10:47:21 -0600 |
| commit | e4c729664339e4be352d4c7434a5c6184285148d (patch) | |
| tree | 57e4c6c8d3988b4bee8da5a0aa5a8e011b74bc57 /kernel | |
| parent | d739a099d0248c78d374b1b610cdb679c7bc052d (diff) | |
| download | linux-next-e4c729664339e4be352d4c7434a5c6184285148d.tar.gz | |
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 <bhelgaas@google.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/resource.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index 8957d686e29b..3c2237ac32db 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -1288,13 +1288,10 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size) if (p->flags & IORESOURCE_BUSY) continue; - printk(KERN_WARNING "resource map sanity check conflict: " - "0x%llx 0x%llx 0x%llx 0x%llx %s\n", + printk(KERN_WARNING "resource sanity check: requesting [mem %#010llx-%#010llx], which spans more than %s %pR\n", (unsigned long long)addr, (unsigned long long)(addr + size - 1), - (unsigned long long)p->start, - (unsigned long long)p->end, - p->name); + p->name, p); err = -1; break; } |