From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: Re: [PATCH 1/1] EFI iounpam fix for acpi_os_unmap_memory Date: Mon, 20 Feb 2006 22:02:19 -0800 Message-ID: <20060220220219.6d82366a.akpm@osdl.org> References: <43FA5293.4070807@ed-soft.at> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from smtp.osdl.org ([65.172.181.4]:22747 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S1161385AbWBUGEG (ORCPT ); Tue, 21 Feb 2006 01:04:06 -0500 In-Reply-To: <43FA5293.4070807@ed-soft.at> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Edgar Hucek Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Matt Domsch Edgar Hucek wrote: > > When EFI is enabled acpi_os_unmap_memory trys to unmap memory > which was not mapped by acpi_os_map_memory. Your email client replaces tabs with spaces and wordwraps things. The patch could be cleaned up a bit.. Matt, ACPi people: please ack or nack asap. From: Edgar Hucek When EFI is enabled acpi_os_unmap_memory t] rys to unmap memory which was not mapped by acpi_os_map_memory. Signed-off-by: Edgar Hucek Signed-off-by: Andrew Morton --- drivers/acpi/osl.c | 4 ++++ 1 files changed, 4 insertions(+) diff -puN drivers/acpi/osl.c~efi-iounpam-fix-for-acpi_os_unmap_memory drivers/acpi/osl.c --- devel/drivers/acpi/osl.c~efi-iounpam-fix-for-acpi_os_unmap_memory 2006-02-20 21:55:48.000000000 -0800 +++ devel-akpm/drivers/acpi/osl.c 2006-02-20 21:58:36.000000000 -0800 @@ -208,6 +208,10 @@ EXPORT_SYMBOL_GPL(acpi_os_map_memory); void acpi_os_unmap_memory(void __iomem * virt, acpi_size size) { + /* Don't unmap memory which was not mapped by acpi_os_map_memory */ + if (efi_enabled && + (efi_mem_attributes(virt_to_phys(virt)) & EFI_MEMORY_WB)) + return; iounmap(virt); } EXPORT_SYMBOL_GPL(acpi_os_unmap_memory); _