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 3c655c54e23131b10cbf33d3d1fb1fe4a81d52be..05cd826ad14d2d1701cfd84e64c8b9fa21e199d9 100644 (file)
--- 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 4bdd178ce7956301c8e709fd69a4aae2e4dec02d..bd240189834a440b6f87dd96363e0313f91148b3 100644 (file)
--- 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