diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-04-18 01:25:46 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-06 21:59:18 +0200 |
| commit | 8c56b5e2a58b2ee9e9199a6a49fbb4a42491a468 (patch) | |
| tree | 3fece5a6cbbdaf725ffe9e9230dd6e51c039e097 | |
| parent | a26f0f39bca31c0d9369545e727cf34c3857a2ff (diff) | |
| download | lwn-8c56b5e2a58b2ee9e9199a6a49fbb4a42491a468.tar.gz lwn-8c56b5e2a58b2ee9e9199a6a49fbb4a42491a468.zip | |
ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline()
commit 4c533c801d1c9b5c38458a0e7516e0cf50643782 upstream.
acpi_scan_is_offline() may be called under the physical_node_lock
lock of the given device object's parent, so prevent lockdep from
complaining about that by annotating that instance with
SINGLE_DEPTH_NESTING.
Fixes: caa73ea158de (ACPI / hotplug / driver core: Handle containers in a special way)
Reported-and-tested-by: Xie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: Toshi Kani <toshi.kani@hp.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/acpi/scan.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 666beea3bf1c..9498c3d575d4 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -192,7 +192,11 @@ bool acpi_scan_is_offline(struct acpi_device *adev, bool uevent) struct acpi_device_physical_node *pn; bool offline = true; - mutex_lock(&adev->physical_node_lock); + /* + * acpi_container_offline() calls this for all of the container's + * children under the container's physical_node_lock lock. + */ + mutex_lock_nested(&adev->physical_node_lock, SINGLE_DEPTH_NESTING); list_for_each_entry(pn, &adev->physical_node_list, node) if (device_supports_offline(pn->dev) && !pn->dev->offline) { |