Fix various minor issues for the MMU-less case

These were mainly caused by kernel updates without testing the
MMU-less case.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

arch/arm/mm/nommu.c

@@ -6,11 +6,14 @@
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/pagemap.h>
+#include <linux/bootmem.h>
 
 #include <asm/cacheflush.h>
 #include <asm/io.h>
 #include <asm/page.h>
 
+#include <asm/mach/arch.h>
+
 #include "mm.h"
 
 extern void _stext, __data_start, _end;
@@ -76,7 +79,7 @@ void __iomem *__ioremap(unsigned long phys_addr, size_t size,
 }
 EXPORT_SYMBOL(__ioremap);
 
-void __iounmap(void __iomem *addr)
+void __iounmap(volatile void __iomem *addr)
 {
 }
 EXPORT_SYMBOL(__iounmap);

include/asm-arm/mach/map.h

@@ -29,5 +29,6 @@ struct map_desc {
 #ifdef CONFIG_MMU
 extern void iotable_init(struct map_desc *, int);
 #else
-#define iotable_init(map,num)	do { } while (0)
+static void inline iotable_init(struct map_desc *io_desc, int nr)
+{ }
 #endif