drm/etnaviv: rename etnaviv_gem_vaddr to etnaviv_gem_vmap

[linux-2.6-block.git] / kernel / resource.c

diff --git a/kernel/resource.c b/kernel/resource.c
index f150dbbe6f62d31aa07b3fbf3f07a8807fa40991..09c0597840b02dc260c65baafdd1fde0715bcbb4 100644 (file)
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -1498,8 +1498,15 @@ int iomem_is_exclusive(u64 addr)
                        break;
                if (p->end < addr)
                        continue;
-               if (p->flags & IORESOURCE_BUSY &&
-                    p->flags & IORESOURCE_EXCLUSIVE) {
+               /*
+                * A resource is exclusive if IORESOURCE_EXCLUSIVE is set
+                * or CONFIG_IO_STRICT_DEVMEM is enabled and the
+                * resource is busy.
+                */
+               if ((p->flags & IORESOURCE_BUSY) == 0)
+                       continue;
+               if (IS_ENABLED(CONFIG_IO_STRICT_DEVMEM)
+                               || p->flags & IORESOURCE_EXCLUSIVE) {
                        err = 1;
                        break;
                }