Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753925AbbGSQuw (ORCPT ); Sun, 19 Jul 2015 12:50:52 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:38201 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753482AbbGSQut (ORCPT ); Sun, 19 Jul 2015 12:50:49 -0400 From: Mathias Krause To: "Rafael J. Wysocki" , Len Brown Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Mathias Krause , Paul Gortmaker Subject: [PATCH 2/2] ACPI / OSL: add comment for the __ref annotation of acpi_os_unmap_iomem() Date: Sun, 19 Jul 2015 18:50:39 +0200 Message-Id: <1437324639-18118-3-git-send-email-minipli@googlemail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1437324639-18118-1-git-send-email-minipli@googlemail.com> References: <1437324639-18118-1-git-send-email-minipli@googlemail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1100 Lines: 32 Add a comment clarifying the need for the __ref annotation of acpi_os_unmap_iomem(). It's safe, however, as acpi_early_init() will set acpi_gbl_permanent_mmap to 1, disabling the problematic branch. Signed-off-by: Mathias Krause Cc: Paul Gortmaker --- drivers/acpi/osl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 3b8963f21b36..7e85fb84e536 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -442,6 +442,9 @@ static void acpi_os_map_cleanup(struct acpi_ioremap *map) } } +/* The __ref annotation is needed as during init we may call out to + * __acpi_unmap_table() which is an __init annotated function. + */ void __ref acpi_os_unmap_iomem(void __iomem *virt, acpi_size size) { struct acpi_ioremap *map; -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/