Merge branch 'x86/grand-schemozzle' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / kernel / iomem.c

diff --git a/kernel/iomem.c b/kernel/iomem.c
index 93c26444451011f50a98a9b918e33069e95b0905..62c92e43aa0d44c647de96c7321415ec919462b7 100644 (file)
--- a/kernel/iomem.c
+++ b/kernel/iomem.c
@@ -121,7 +121,7 @@ EXPORT_SYMBOL(memremap);
 
 void memunmap(void *addr)
 {
-       if (is_vmalloc_addr(addr))
+       if (is_ioremap_addr(addr))
                iounmap((void __iomem *) addr);
 }
 EXPORT_SYMBOL(memunmap);