diff options
Diffstat (limited to 'arch/arm/mm/proc-arm720.S')
-rw-r--r-- | arch/arm/mm/proc-arm720.S | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S index eda733d30455..85ae18695f10 100644 --- a/arch/arm/mm/proc-arm720.S +++ b/arch/arm/mm/proc-arm720.S | |||
@@ -36,7 +36,7 @@ | |||
36 | #include <linux/init.h> | 36 | #include <linux/init.h> |
37 | #include <asm/assembler.h> | 37 | #include <asm/assembler.h> |
38 | #include <asm/asm-offsets.h> | 38 | #include <asm/asm-offsets.h> |
39 | #include <asm/elf.h> | 39 | #include <asm/hwcap.h> |
40 | #include <asm/pgtable-hwdef.h> | 40 | #include <asm/pgtable-hwdef.h> |
41 | #include <asm/pgtable.h> | 41 | #include <asm/pgtable.h> |
42 | #include <asm/ptrace.h> | 42 | #include <asm/ptrace.h> |
@@ -93,29 +93,12 @@ ENTRY(cpu_arm720_switch_mm) | |||
93 | * : r1 = value to set | 93 | * : r1 = value to set |
94 | * Purpose : Set a PTE and flush it out of any WB cache | 94 | * Purpose : Set a PTE and flush it out of any WB cache |
95 | */ | 95 | */ |
96 | .align 5 | 96 | .align 5 |
97 | ENTRY(cpu_arm720_set_pte_ext) | 97 | ENTRY(cpu_arm720_set_pte_ext) |
98 | #ifdef CONFIG_MMU | 98 | #ifdef CONFIG_MMU |
99 | str r1, [r0], #-2048 @ linux version | 99 | armv3_set_pte_ext wc_disable=0 |
100 | |||
101 | eor r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY | ||
102 | |||
103 | bic r2, r1, #PTE_SMALL_AP_MASK | ||
104 | bic r2, r2, #PTE_TYPE_MASK | ||
105 | orr r2, r2, #PTE_TYPE_SMALL | ||
106 | |||
107 | tst r1, #L_PTE_USER @ User? | ||
108 | orrne r2, r2, #PTE_SMALL_AP_URO_SRW | ||
109 | |||
110 | tst r1, #L_PTE_WRITE | L_PTE_DIRTY @ Write and Dirty? | ||
111 | orreq r2, r2, #PTE_SMALL_AP_UNO_SRW | ||
112 | |||
113 | tst r1, #L_PTE_PRESENT | L_PTE_YOUNG @ Present and Young | ||
114 | movne r2, #0 | ||
115 | |||
116 | str r2, [r0] @ hardware version | ||
117 | #endif | 100 | #endif |
118 | mov pc, lr | 101 | mov pc, lr |
119 | 102 | ||
120 | /* | 103 | /* |
121 | * Function: arm720_reset | 104 | * Function: arm720_reset |