From e4c1b977f0036c00ebabb60375cb63d0de9d43fa Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 30 Jan 2008 13:34:05 +0100 Subject: [PATCH] x86: use remove_vm_are in ioremap_32 error path When ioremap_page_range fails, then we can use remove_vm_area instead of vunmap safely. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/x86/mm/ioremap_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/mm/ioremap_32.c b/arch/x86/mm/ioremap_32.c index 5273ac4..4d919c3 100644 --- a/arch/x86/mm/ioremap_32.c +++ b/arch/x86/mm/ioremap_32.c @@ -118,7 +118,7 @@ void __iomem *__ioremap(unsigned long phys_addr, unsigned long size, addr = (void __iomem *) area->addr; if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size, phys_addr, pgprot)) { - vunmap((void __force *) addr); + remove_vm_area((void *)(PAGE_MASK & (unsigned long) addr)); return NULL; } -- 2.7.4