From patchwork Mon Jan 24 23:30:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 503391 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0ONY4ZK022023 for ; Mon, 24 Jan 2011 23:34:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753284Ab1AXXds (ORCPT ); Mon, 24 Jan 2011 18:33:48 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:35691 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753278Ab1AXXdW (ORCPT ); Mon, 24 Jan 2011 18:33:22 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id F3D511A3148; Tue, 25 Jan 2011 00:36:13 +0100 (CET) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 07989-06; Tue, 25 Jan 2011 00:35:46 +0100 (CET) Received: from ferrari.rjw.lan (220-bem-13.acn.waw.pl [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id CA7151A31EB; Tue, 25 Jan 2011 00:35:09 +0100 (CET) From: "Rafael J. Wysocki" To: Len Brown Subject: [PATCH 7/8] ACPI: Introduce acpi_os_get_iomem() Date: Tue, 25 Jan 2011 00:30:52 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.38-rc1+; KDE/4.4.4; x86_64; ; ) Cc: Jeff Chua , LKML , ACPI Devel Maling List , "Linux-pm mailing list" , Matthew Garrett References: <201101201226.41021.rjw@sisk.pl> <201101250025.10817.rjw@sisk.pl> In-Reply-To: <201101250025.10817.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201101250030.53131.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 24 Jan 2011 23:34:06 +0000 (UTC) Index: linux-2.6/drivers/acpi/osl.c =================================================================== --- linux-2.6.orig/drivers/acpi/osl.c +++ linux-2.6/drivers/acpi/osl.c @@ -285,6 +285,22 @@ acpi_map_vaddr_lookup(acpi_physical_addr return NULL; } +void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size) +{ + struct acpi_ioremap *map; + void __iomem *virt = NULL; + + mutex_lock(&acpi_ioremap_lock); + map = acpi_map_lookup(phys, size); + if (map) { + virt = map->virt + (phys - map->phys); + map->refcount++; + } + mutex_unlock(&acpi_ioremap_lock); + return virt; +} +EXPORT_SYMBOL_GPL(acpi_os_get_iomem); + /* Must be called with 'acpi_ioremap_lock' or RCU read lock held. */ static struct acpi_ioremap * acpi_map_lookup_virt(void __iomem *virt, acpi_size size) Index: linux-2.6/include/linux/acpi_io.h =================================================================== --- linux-2.6.orig/include/linux/acpi_io.h +++ linux-2.6/include/linux/acpi_io.h @@ -10,4 +10,6 @@ static inline void __iomem *acpi_os_iore return ioremap_cache(phys, size); } +void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size); + #endif