diff options
Diffstat (limited to 'arch/arm/mm/cache-v7.S')
| -rw-r--r-- | arch/arm/mm/cache-v7.S | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S index 37c8157e116e..e8ea1a071f43 100644 --- a/arch/arm/mm/cache-v7.S +++ b/arch/arm/mm/cache-v7.S | |||
| @@ -91,11 +91,8 @@ ENTRY(v7_flush_kern_cache_all) | |||
| 91 | THUMB( stmfd sp!, {r4-r7, r9-r11, lr} ) | 91 | THUMB( stmfd sp!, {r4-r7, r9-r11, lr} ) |
| 92 | bl v7_flush_dcache_all | 92 | bl v7_flush_dcache_all |
| 93 | mov r0, #0 | 93 | mov r0, #0 |
| 94 | #ifdef CONFIG_SMP | 94 | ALT_SMP(mcr p15, 0, r0, c7, c1, 0) @ invalidate I-cache inner shareable |
| 95 | mcr p15, 0, r0, c7, c1, 0 @ invalidate I-cache inner shareable | 95 | ALT_UP(mcr p15, 0, r0, c7, c5, 0) @ I+BTB cache invalidate |
| 96 | #else | ||
| 97 | mcr p15, 0, r0, c7, c5, 0 @ I+BTB cache invalidate | ||
| 98 | #endif | ||
| 99 | ARM( ldmfd sp!, {r4-r5, r7, r9-r11, lr} ) | 96 | ARM( ldmfd sp!, {r4-r5, r7, r9-r11, lr} ) |
| 100 | THUMB( ldmfd sp!, {r4-r7, r9-r11, lr} ) | 97 | THUMB( ldmfd sp!, {r4-r7, r9-r11, lr} ) |
| 101 | mov pc, lr | 98 | mov pc, lr |
| @@ -171,11 +168,8 @@ ENTRY(v7_coherent_user_range) | |||
| 171 | cmp r0, r1 | 168 | cmp r0, r1 |
| 172 | blo 1b | 169 | blo 1b |
| 173 | mov r0, #0 | 170 | mov r0, #0 |
| 174 | #ifdef CONFIG_SMP | 171 | ALT_SMP(mcr p15, 0, r0, c7, c1, 6) @ invalidate BTB Inner Shareable |
| 175 | mcr p15, 0, r0, c7, c1, 6 @ invalidate BTB Inner Shareable | 172 | ALT_UP(mcr p15, 0, r0, c7, c5, 6) @ invalidate BTB |
| 176 | #else | ||
| 177 | mcr p15, 0, r0, c7, c5, 6 @ invalidate BTB | ||
| 178 | #endif | ||
| 179 | dsb | 173 | dsb |
| 180 | isb | 174 | isb |
| 181 | mov pc, lr | 175 | mov pc, lr |