From: Andrew Morton <akpm@linux-foundation.org>

Hopefully repair all the architectures which broke.

Cc: Rik van Riel <riel@redhat.com>
Cc: Benjamin Herrensmidt <benh@kernel.crashing.org>
Cc: Dave Airlie <airlied@linux.ie>
Cc: Hugh Dickins <hugh@veritas.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/char/mem.c |    2 ++
 1 file changed, 2 insertions(+)

diff -puN drivers/char/mem.c~use-generic_access_phys-for-dev-mem-mappings-fix drivers/char/mem.c
--- a/drivers/char/mem.c~use-generic_access_phys-for-dev-mem-mappings-fix
+++ a/drivers/char/mem.c
@@ -328,7 +328,9 @@ static void mmap_mem_close(struct vm_are
 static struct vm_operations_struct mmap_mem_ops = {
 	.open  = mmap_mem_open,
 	.close = mmap_mem_close,
+#ifdef CONFIG_HAVE_IOREMAP_PROT
 	.access = generic_access_phys
+#endif
 };
 
 static int mmap_mem(struct file * file, struct vm_area_struct * vma)
_