Merge branch 'linus' into x86/cleanups

Conflicts:
	arch/x86/kernel/reboot.c

1 files changed, 9 insertions, 0 deletions

diff --git a/kernel/resource.c b/kernel/resource.c
index 4337063663ef..e633106b12f6 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -853,6 +853,15 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size)
                 if (PFN_DOWN(p->start) <= PFN_DOWN(addr) &&
                     PFN_DOWN(p->end) >= PFN_DOWN(addr + size - 1))
                         continue;
+                /*
+                 * if a resource is "BUSY", it's not a hardware resource
+                 * but a driver mapping of such a resource; we don't want
+                 * to warn for those; some drivers legitimately map only
+                 * partial hardware resources. (example: vesafb)
+                 */
+                if (p->flags & IORESOURCE_BUSY)
+                        continue;
+
                 printk(KERN_WARNING "resource map sanity check conflict: "
                        "0x%llx 0x%llx 0x%llx 0x%llx %s\n",
                        (unsigned long long)addr,