Commit bee6f871 authored by Joel Fernandes (Google)'s avatar Joel Fernandes (Google) Committed by Paul E. McKenney
Browse files

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarJoel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.ibm.com>
parent 842a56cf

drivers/acpi/osl.c

+4 −2
Original line number Diff line number Diff line
@@ -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;