From 88eff3146d8fc9aa1de909ae4a5d200269e1a4af Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Tue, 18 Oct 2011 16:16:43 +1000
Subject: [PATCH] --- yaml --- r: 279738 b: refs/heads/master c:
 d49316e84bbad307543c50be53555ca9a768f31d h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/m68k/include/asm/motorola_pgtable.h | 1 +
 trunk/arch/m68k/mm/kmap.c                      | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b3b95f88ce37..7d5bb376019a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60610192559d430dd24d9b508ae9d8d249709af9
+refs/heads/master: d49316e84bbad307543c50be53555ca9a768f31d
diff --git a/trunk/arch/m68k/include/asm/motorola_pgtable.h b/trunk/arch/m68k/include/asm/motorola_pgtable.h
index 45bd3f589bf0..e0fdd4d08075 100644
--- a/trunk/arch/m68k/include/asm/motorola_pgtable.h
+++ b/trunk/arch/m68k/include/asm/motorola_pgtable.h
@@ -8,6 +8,7 @@
 #define _PAGE_PRESENT	0x001
 #define _PAGE_SHORT	0x002
 #define _PAGE_RONLY	0x004
+#define _PAGE_READWRITE	0x000
 #define _PAGE_ACCESSED	0x008
 #define _PAGE_DIRTY	0x010
 #define _PAGE_SUPER	0x080	/* 68040 supervisor only */
diff --git a/trunk/arch/m68k/mm/kmap.c b/trunk/arch/m68k/mm/kmap.c
index 69345849454b..1cc2bed4c3dd 100644
--- a/trunk/arch/m68k/mm/kmap.c
+++ b/trunk/arch/m68k/mm/kmap.c
@@ -171,7 +171,8 @@ void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cachefla
 			break;
 		}
 	} else {
-		physaddr |= (_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_DIRTY);
+		physaddr |= (_PAGE_PRESENT | _PAGE_ACCESSED |
+			     _PAGE_DIRTY | _PAGE_READWRITE);
 		switch (cacheflag) {
 		case IOMAP_NOCACHE_SER:
 		case IOMAP_NOCACHE_NONSER: