[ARM] Convert set_pte_ext implementions to macros

There are actually only four separate implementations of set_pte_ext.
Use assembler macros to insert code for these into the proc-*.S files.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 1 insertions, 23 deletions

diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S
index 2a4ea1659e96..68db8c5a4e98 100644
--- a/arch/arm/mm/proc-arm1022.S
+++ b/arch/arm/mm/proc-arm1022.S
@@ -365,29 +365,7 @@ ENTRY(cpu_arm1022_switch_mm)
         .align  5
 ENTRY(cpu_arm1022_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, 1          @ clean D entry