Merge branch 'ptebits' into devel

Conflicts:

	arch/arm/Kconfig

1 files changed, 2 insertions, 24 deletions

diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
index 5673f4d6113b..b5551bf010aa 100644
--- a/arch/arm/mm/proc-arm1020.S
+++ b/arch/arm/mm/proc-arm1020.S
@@ -29,7 +29,7 @@
 #include <linux/init.h>
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
-#include <asm/elf.h>
+#include <asm/hwcap.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
@@ -399,29 +399,7 @@ ENTRY(cpu_arm1020_switch_mm)
         .align  5
 ENTRY(cpu_arm1020_set_pte_ext)
 #ifdef CONFIG_MMU
-        str     r1, [r0], #-2048                @ linux version
-
-        eor     r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
-
-        bic     r2, r1, #PTE_SMALL_AP_MASK
-        bic     r2, r2, #PTE_TYPE_MASK
-        orr     r2, r2, #PTE_TYPE_SMALL
-
-        tst     r1, #L_PTE_USER                 @ User?
-        orrne   r2, r2, #PTE_SMALL_AP_URO_SRW
-
-        tst     r1, #L_PTE_WRITE | L_PTE_DIRTY  @ Write and Dirty?
-        orreq   r2, r2, #PTE_SMALL_AP_UNO_SRW
-
-        tst     r1, #L_PTE_PRESENT | L_PTE_YOUNG        @ Present and Young?
-        movne   r2, #0
-
-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
-        eor     r3, r1, #0x0a                   @ C & small page?
-        tst     r3, #0x0b
-        biceq   r2, r2, #4
-#endif
-        str     r2, [r0]                        @ hardware version
+        armv3_set_pte_ext
         mov     r0, r0
 #ifndef CONFIG_CPU_DCACHE_DISABLE
         mcr     p15, 0, r0, c7, c10, 4