[ARM] Convert set_pte_ext implementions to macros

[linux-2.6-omap-h63xx.git] / arch / arm / mm / proc-arm720.S

diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S
index ca5e7aac2da7d711518ae74cd828b4a483828028..6d3e0620be71e0cb598dd921c441c4aeed75897e 100644 (file)
--- a/arch/arm/mm/proc-arm720.S
+++ b/arch/arm/mm/proc-arm720.S
@@ -93,29 +93,12 @@ ENTRY(cpu_arm720_switch_mm)
  *        : r1 = value to set
  * Purpose : Set a PTE and flush it out of any WB cache
  */
-               .align  5
+       .align  5
 ENTRY(cpu_arm720_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
-
-               str     r2, [r0]                        @ hardware version
+       armv3_set_pte_ext wc_disable=0
 #endif
-               mov     pc, lr
+       mov     pc, lr
 
 /*
  * Function: arm720_reset
@@ -198,6 +181,7 @@ arm720_crval:
                .type   arm720_processor_functions, #object
 ENTRY(arm720_processor_functions)
                .word   v4t_late_abort
+               .word   pabort_noifar
                .word   cpu_arm720_proc_init
                .word   cpu_arm720_proc_fin
                .word   cpu_arm720_reset
@@ -205,7 +189,6 @@ ENTRY(arm720_processor_functions)
                .word   cpu_arm720_dcache_clean_area
                .word   cpu_arm720_switch_mm
                .word   cpu_arm720_set_pte_ext
-               .word   pabort_noifar
                .size   arm720_processor_functions, . - arm720_processor_functions
 
                .section ".rodata"
@@ -231,7 +214,7 @@ cpu_arm720_name:
                .align
 
 /*
- * See linux/include/asm-arm/procinfo.h for a definition of this structure.
+ * See <asm/procinfo.h> for a definition of this structure.
  */
        
                .section ".proc.info.init", #alloc, #execinstr