From: Tony Lindgren <tony@atomide.com>
Date: Fri, 2 Sep 2005 07:53:31 +0000 (+0300)
Subject: ARM: OMAP: Undo previous v6 userspace patch and apply RMK's version
X-Git-Tag: v2.6.13-omap1~9
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=42cb999deb71e8c2a23d0b26f90b2b25c589e533;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Undo previous v6 userspace patch and apply RMK's version

The previous patch to make userspace work again on v6 had a problem
with vectors at 0xffff0000. RMK's version fixes the problem in the
patch that added L_PTE_ASID.
---

diff --git a/arch/arm/mm/mm-armv.c b/arch/arm/mm/mm-armv.c
index 3c655c54e23..05cd826ad14 100644
--- a/arch/arm/mm/mm-armv.c
+++ b/arch/arm/mm/mm-armv.c
@@ -459,7 +459,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);
 	}
 
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index 4bdd178ce79..bd240189834 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -141,7 +141,7 @@ ENTRY(cpu_v6_set_pte)
 	orreq	r2, r2, #PTE_EXT_APX
 
 	tst	r1, #L_PTE_USER
-	orrne	r2, r2, #PTE_EXT_AP1 | PTE_EXT_NG
+	orrne	r2, r2, #PTE_EXT_AP1
 	bicne	r2, r2, #PTE_EXT_AP0
 	tstne	r1, #L_PTE_WRITE
 	tstne	r1, #L_PTE_DIRTY