---

yaml --- r: 86595 b: refs/heads/master c: b16bf71 h: refs/heads/master i: 86593: 683e967 86591: e5e1964 v: v3
git-mirror · Feb 29, 2008 · a0d07c8 · a0d07c8
1 parent 59728ef
commit a0d07c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 	}