Merge branch 'pgt' (early part) into devel

diff --cc arch/arm/kernel/smp.c
Simple merge

diff --cc arch/arm/kernel/traps.c
Simple merge

diff --cc arch/arm/mm/mmu.c
Simple merge

diff --cc arch/arm/mm/proc-macros.S
index f8f777df8d72780c6b105481f28dd1767180649e,f5ca6aaecdbdba98cf6a4ea5b629374248e490ed..e32fa499194ca717b27a3391bf0c71879ad4a352
--- 1/arch/arm/mm/proc-macros.S
--- 2/arch/arm/mm/proc-macros.S
+++ b/arch/arm/mm/proc-macros.S
@@@ -152,14 -138,11 +152,14 @@@
  
        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
  

diff --cc arch/arm/mm/proc-v7.S
index 7401f4d7e6763a9fb02c54a98dc63cba404e3d47,210d051c54d7e8ecdd6635effdd5296fd17da79b..b49fab21517c04b1f0d7476571a05b7133ca4826
--- 1/arch/arm/mm/proc-v7.S
--- 2/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@@ -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