diff --git a/[refs] b/[refs] index b1b0c4ba5112..1ee7337561aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b40fcee131847069543cc60a3a79887743c53db +refs/heads/master: e4c1b977f0036c00ebabb60375cb63d0de9d43fa diff --git a/trunk/arch/x86/mm/ioremap_32.c b/trunk/arch/x86/mm/ioremap_32.c index 5273ac4aa96a..4d919c37d1d6 100644 --- a/trunk/arch/x86/mm/ioremap_32.c +++ b/trunk/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; }