2 files changed, 3 insertions, 1 deletions

diff --git a/arch/avr32/mm/init.c b/arch/avr32/mm/init.c
index 3e6c4103980..70da6894acc 100644
--- a/arch/avr32/mm/init.c
+++ b/arch/avr32/mm/init.c
@@ -206,7 +206,7 @@ void __init setup_bootmem(void)
 
         if (mem_ramdisk) {
 #ifdef CONFIG_BLK_DEV_INITRD
-                initrd_start = __va(mem_ramdisk->addr);
+                initrd_start = (unsigned long)__va(mem_ramdisk->addr);
                 initrd_end = initrd_start + mem_ramdisk->size;
 
                 print_memory_map("RAMDISK images", mem_ramdisk);
diff --git a/arch/avr32/mm/ioremap.c b/arch/avr32/mm/ioremap.c
index 8cfec65e37f..3437c82434a 100644
--- a/arch/avr32/mm/ioremap.c
+++ b/arch/avr32/mm/ioremap.c
@@ -77,6 +77,8 @@ void __iounmap(void __iomem *addr)
 
         if ((unsigned long)addr >= P4SEG)
                 return;
+        if (PXSEG(addr) == P2SEG)
+                return;
 
         p = remove_vm_area((void *)(PAGE_MASK & (unsigned long __force)addr));
         if (unlikely(!p)) {