vserver 2.0 rc7

[linux-2.6.git] / arch / sh64 / mm / ioremap.c

diff --git a/arch/sh64/mm/ioremap.c b/arch/sh64/mm/ioremap.c
index 8e05490..f4003da 100644 (file)
--- a/arch/sh64/mm/ioremap.c
+++ b/arch/sh64/mm/ioremap.c
@@ -182,8 +182,8 @@ void iounmap(void *addr)
 }
 
 static struct resource shmedia_iomap = {
-        .name  = "shmedia_iomap",
-       .start  = IOBASE_VADDR,
+       .name   = "shmedia_iomap",
+       .start  = IOBASE_VADDR + PAGE_SIZE,
        .end    = IOBASE_END - 1,
 };
 
@@ -400,7 +400,7 @@ static void shmedia_unmapioaddr(unsigned long vaddr)
                return;
 
        clear_page((void *)ptep);
-       pte_clear(ptep);
+       pte_clear(&init_mm, vaddr, ptep);
 }
 
 unsigned long onchip_remap(unsigned long phys, unsigned long size, const char *name)