Merge branches 'dma-api', 'pci/virtualization', 'pci/msi', 'pci/misc' and 'pci/resour...

[mirror_ubuntu-zesty-kernel.git] / kernel / resource.c

diff --git a/kernel/resource.c b/kernel/resource.c
index 673061c06da182dbe02993d6f332168f8b3b3c96..3c2237ac32dbedf56d10444a7feef59e6b35a561 100644 (file)
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -511,7 +511,7 @@ static int find_resource(struct resource *root, struct resource *new,
  * @newsize: new size of the resource descriptor
  * @constraint: the size and alignment constraints to be met.
  */
-int reallocate_resource(struct resource *root, struct resource *old,
+static int reallocate_resource(struct resource *root, struct resource *old,
                        resource_size_t newsize,
                        struct resource_constraint  *constraint)
 {
@@ -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;
        }