From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 1 Sep 2005 21:41:55 +0000 (+0100)
Subject: [ARM] Fix ARMv6 page table bits
X-Git-Tag: v2.6.14-rc1~1016^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=86a8a83963a3f6beeca4900d26da93c7d2a9d92d;p=linux-2.6-omap-h63xx.git

[ARM] Fix ARMv6 page table bits

We weren't explicitly setting the page table bits we desired
in user_prot in the protection table, which resulted in the
user mappings for v6 CPUs being marked global.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mm/mm-armv.c b/arch/arm/mm/mm-armv.c
index 3a81944d74b..d125a3dc061 100644
--- a/arch/arm/mm/mm-armv.c
+++ b/arch/arm/mm/mm-armv.c
@@ -453,7 +453,7 @@ static void __init build_mem_type_table(void)
 
 	for (i = 0; i < 16; i++) {
 		unsigned long v = pgprot_val(protection_map[i]);
-		v &= (~(PTE_BUFFERABLE|PTE_CACHEABLE)) | user_pgprot;
+		v = (v & ~(PTE_BUFFERABLE|PTE_CACHEABLE)) | user_pgprot;
 		protection_map[i] = __pgprot(v);
 	}