Merge branch 'pgt' (early part) into devel
Russell King [Thu, 6 Jan 2011 22:33:19 +0000 (22:33 +0000)]
1  2 
arch/arm/kernel/smp.c
arch/arm/kernel/traps.c
arch/arm/mm/mmu.c
arch/arm/mm/proc-macros.S
arch/arm/mm/proc-v7.S

Simple merge
Simple merge
Simple merge
  
        tst     r1, #L_PTE_USER
        orrne   r3, r3, #PTE_EXT_AP1
 +#ifdef CONFIG_CPU_USE_DOMAINS
 +      @ allow kernel read/write access to read-only user pages
        tstne   r3, #PTE_EXT_APX
        bicne   r3, r3, #PTE_EXT_APX | PTE_EXT_AP0
 +#endif
  
-       tst     r1, #L_PTE_EXEC
-       orreq   r3, r3, #PTE_EXT_XN
+       tst     r1, #L_PTE_XN
+       orrne   r3, r3, #PTE_EXT_XN
  
        orr     r3, r3, r2
  
@@@ -148,14 -146,11 +146,14 @@@ ENTRY(cpu_v7_set_pte_ext
  
        tst     r1, #L_PTE_USER
        orrne   r3, r3, #PTE_EXT_AP1
 +#ifdef CONFIG_CPU_USE_DOMAINS
 +      @ allow kernel read/write access to read-only user pages
        tstne   r3, #PTE_EXT_APX
        bicne   r3, r3, #PTE_EXT_APX | PTE_EXT_AP0
 +#endif
  
-       tst     r1, #L_PTE_EXEC
-       orreq   r3, r3, #PTE_EXT_XN
+       tst     r1, #L_PTE_XN
+       orrne   r3, r3, #PTE_EXT_XN
  
        tst     r1, #L_PTE_YOUNG
        tstne   r1, #L_PTE_PRESENT