diff options
Diffstat (limited to 'arch/arm/mm/cache-v4wt.S')
-rw-r--r-- | arch/arm/mm/cache-v4wt.S | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/mm/cache-v4wt.S b/arch/arm/mm/cache-v4wt.S index 11e5e5838bc5..a0982ce49007 100644 --- a/arch/arm/mm/cache-v4wt.S +++ b/arch/arm/mm/cache-v4wt.S | |||
@@ -13,6 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <asm/assembler.h> | ||
16 | #include <asm/page.h> | 17 | #include <asm/page.h> |
17 | #include "proc-macros.S" | 18 | #include "proc-macros.S" |
18 | 19 | ||
@@ -48,7 +49,7 @@ | |||
48 | ENTRY(v4wt_flush_icache_all) | 49 | ENTRY(v4wt_flush_icache_all) |
49 | mov r0, #0 | 50 | mov r0, #0 |
50 | mcr p15, 0, r0, c7, c5, 0 @ invalidate I cache | 51 | mcr p15, 0, r0, c7, c5, 0 @ invalidate I cache |
51 | mov pc, lr | 52 | ret lr |
52 | ENDPROC(v4wt_flush_icache_all) | 53 | ENDPROC(v4wt_flush_icache_all) |
53 | 54 | ||
54 | /* | 55 | /* |
@@ -71,7 +72,7 @@ __flush_whole_cache: | |||
71 | tst r2, #VM_EXEC | 72 | tst r2, #VM_EXEC |
72 | mcrne p15, 0, ip, c7, c5, 0 @ invalidate I cache | 73 | mcrne p15, 0, ip, c7, c5, 0 @ invalidate I cache |
73 | mcr p15, 0, ip, c7, c6, 0 @ invalidate D cache | 74 | mcr p15, 0, ip, c7, c6, 0 @ invalidate D cache |
74 | mov pc, lr | 75 | ret lr |
75 | 76 | ||
76 | /* | 77 | /* |
77 | * flush_user_cache_range(start, end, flags) | 78 | * flush_user_cache_range(start, end, flags) |
@@ -94,7 +95,7 @@ ENTRY(v4wt_flush_user_cache_range) | |||
94 | add r0, r0, #CACHE_DLINESIZE | 95 | add r0, r0, #CACHE_DLINESIZE |
95 | cmp r0, r1 | 96 | cmp r0, r1 |
96 | blo 1b | 97 | blo 1b |
97 | mov pc, lr | 98 | ret lr |
98 | 99 | ||
99 | /* | 100 | /* |
100 | * coherent_kern_range(start, end) | 101 | * coherent_kern_range(start, end) |
@@ -126,7 +127,7 @@ ENTRY(v4wt_coherent_user_range) | |||
126 | cmp r0, r1 | 127 | cmp r0, r1 |
127 | blo 1b | 128 | blo 1b |
128 | mov r0, #0 | 129 | mov r0, #0 |
129 | mov pc, lr | 130 | ret lr |
130 | 131 | ||
131 | /* | 132 | /* |
132 | * flush_kern_dcache_area(void *addr, size_t size) | 133 | * flush_kern_dcache_area(void *addr, size_t size) |
@@ -160,7 +161,7 @@ v4wt_dma_inv_range: | |||
160 | add r0, r0, #CACHE_DLINESIZE | 161 | add r0, r0, #CACHE_DLINESIZE |
161 | cmp r0, r1 | 162 | cmp r0, r1 |
162 | blo 1b | 163 | blo 1b |
163 | mov pc, lr | 164 | ret lr |
164 | 165 | ||
165 | /* | 166 | /* |
166 | * dma_flush_range(start, end) | 167 | * dma_flush_range(start, end) |
@@ -192,7 +193,7 @@ ENTRY(v4wt_dma_unmap_area) | |||
192 | * - dir - DMA direction | 193 | * - dir - DMA direction |
193 | */ | 194 | */ |
194 | ENTRY(v4wt_dma_map_area) | 195 | ENTRY(v4wt_dma_map_area) |
195 | mov pc, lr | 196 | ret lr |
196 | ENDPROC(v4wt_dma_unmap_area) | 197 | ENDPROC(v4wt_dma_unmap_area) |
197 | ENDPROC(v4wt_dma_map_area) | 198 | ENDPROC(v4wt_dma_map_area) |
198 | 199 | ||