[PATCH] m68k: fix __iounmap for 030

Ignore empty pmd entry during iomap (these are the holes between the
mappings).

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 4 insertions, 2 deletions

diff --git a/arch/m68k/mm/kmap.c b/arch/m68k/mm/kmap.c
index 85ad19a0ac7..43ffab04872 100644
--- a/arch/m68k/mm/kmap.c
+++ b/arch/m68k/mm/kmap.c
@@ -259,13 +259,15 @@ void __iounmap(void *addr, unsigned long size)
 
                 if (CPU_IS_020_OR_030) {
                         int pmd_off = (virtaddr/PTRTREESIZE) & 15;
+                        int pmd_type = pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK;
 
-                        if ((pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK) == _PAGE_PRESENT) {
+                        if (pmd_type == _PAGE_PRESENT) {
                                 pmd_dir->pmd[pmd_off] = 0;
                                 virtaddr += PTRTREESIZE;
                                 size -= PTRTREESIZE;
                                 continue;
-                        }
+                        } else if (pmd_type == 0)
+                                continue;
                 }
 
                 if (pmd_bad(*pmd_dir)) {