From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933307AbbDJXGy (ORCPT ); Fri, 10 Apr 2015 19:06:54 -0400 Received: from v094114.home.net.pl ([79.96.170.134]:50595 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754934AbbDJXGv (ORCPT ); Fri, 10 Apr 2015 19:06:51 -0400 From: "Rafael J. Wysocki" To: linux-acpi@vger.kernel.org Cc: Xie XiuQi , guohanjun@huawei.com, hanjun.guo@linaro.org, linux-kernel@vger.kernel.org, Toshi Kani Subject: [PATCH] ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline() Date: Sat, 11 Apr 2015 01:31:08 +0200 Message-ID: <2181841.0nPiIAbDNm@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/3.19.0+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <12760195.2odgqTkKju@vostro.rjw.lan> References: <1428397392-26200-1-git-send-email-xiexiuqi@huawei.com> <5219717.RxvSXtBaZ8@vostro.rjw.lan> <12760195.2odgqTkKju@vostro.rjw.lan> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafael J. Wysocki acpi_scan_is_offline() may be called under the physical_node_lock of the given device object's parent, so prevent lockdep from complaining about that by annotating that instance with SINGLE_DEPTH_NESTING. Reported-by: Xie XiuQi Signed-off-by: Rafael J. Wysocki --- drivers/acpi/scan.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) Index: linux-pm/drivers/acpi/scan.c =================================================================== --- linux-pm.orig/drivers/acpi/scan.c +++ linux-pm/drivers/acpi/scan.c @@ -298,7 +298,11 @@ bool acpi_scan_is_offline(struct acpi_de 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) {