From a0d07c8e1050b9907fe98d8d909440a21bce67da Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 28 Feb 2008 14:02:08 +0100
Subject: [PATCH] --- yaml --- r: 86595 b: refs/heads/master c:
 b16bf712f491808a8c926dd481c696fe7d73ee5a h: refs/heads/master i:   86593:
 683e967a1bab7d1a1ac527612869c93450de7d5d   86591:
 e5e1964187822f64bb1b0ce61c11d15b2dfce086 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/mm/ioremap.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6b8f20a017e3..bf1ed990e33b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2dbe03dccc95f41429d60e4221b02fc0f112cc4
+refs/heads/master: b16bf712f491808a8c926dd481c696fe7d73ee5a
diff --git a/trunk/arch/x86/mm/ioremap.c b/trunk/arch/x86/mm/ioremap.c
index 882328efc3db..ac3c959e271d 100644
--- a/trunk/arch/x86/mm/ioremap.c
+++ b/trunk/arch/x86/mm/ioremap.c
@@ -162,7 +162,7 @@ static void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
 	area->phys_addr = phys_addr;
 	vaddr = (unsigned long) area->addr;
 	if (ioremap_page_range(vaddr, vaddr + size, phys_addr, prot)) {
-		remove_vm_area((void *)(vaddr & PAGE_MASK));
+		free_vm_area(area);
 		return NULL;
 	}