acpi: Use built-in RCU list checking for acpi_ioremaps list

This commit applies the consolidated list_for_each_entry_rcu() support
for lockdep conditions.

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com>

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 9c0edf2fc0dd57df77d526e25d3f69dd3b2cd81b..2f9d0d20b83661af54500daf5d2771e55d0db284 100644 (file)
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -14,6 +14,7 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/highmem.h>
+#include <linux/lockdep.h>
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/kmod.h>
@@ -80,6 +81,7 @@ struct acpi_ioremap {
 
 static LIST_HEAD(acpi_ioremaps);
 static DEFINE_MUTEX(acpi_ioremap_lock);
+#define acpi_ioremap_lock_held() lock_is_held(&acpi_ioremap_lock.dep_map)
 
 static void __init acpi_request_region (struct acpi_generic_address *gas,
        unsigned int length, char *desc)
@@ -206,7 +208,7 @@ acpi_map_lookup(acpi_physical_address phys, acpi_size size)
 {
        struct acpi_ioremap *map;
 
-       list_for_each_entry_rcu(map, &acpi_ioremaps, list)
+       list_for_each_entry_rcu(map, &acpi_ioremaps, list, acpi_ioremap_lock_held())
                if (map->phys <= phys &&
                    phys + size <= map->phys + map->size)
                        return map;
@@ -249,7 +251,7 @@ acpi_map_lookup_virt(void __iomem *virt, acpi_size size)
 {
        struct acpi_ioremap *map;
 
-       list_for_each_entry_rcu(map, &acpi_ioremaps, list)
+       list_for_each_entry_rcu(map, &acpi_ioremaps, list, acpi_ioremap_lock_held())
                if (map->virt <= virt &&
                    virt + size <= map->virt + map->size)
                        return map;