diff options
Diffstat (limited to 'arch/arm/mm/tlb-fa.S')
-rw-r--r-- | arch/arm/mm/tlb-fa.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mm/tlb-fa.S b/arch/arm/mm/tlb-fa.S index d3ddcf9a76ca..d2d9ecbe0aac 100644 --- a/arch/arm/mm/tlb-fa.S +++ b/arch/arm/mm/tlb-fa.S | |||
@@ -18,6 +18,7 @@ | |||
18 | */ | 18 | */ |
19 | #include <linux/linkage.h> | 19 | #include <linux/linkage.h> |
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <asm/assembler.h> | ||
21 | #include <asm/asm-offsets.h> | 22 | #include <asm/asm-offsets.h> |
22 | #include <asm/tlbflush.h> | 23 | #include <asm/tlbflush.h> |
23 | #include "proc-macros.S" | 24 | #include "proc-macros.S" |
@@ -37,7 +38,7 @@ ENTRY(fa_flush_user_tlb_range) | |||
37 | vma_vm_mm ip, r2 | 38 | vma_vm_mm ip, r2 |
38 | act_mm r3 @ get current->active_mm | 39 | act_mm r3 @ get current->active_mm |
39 | eors r3, ip, r3 @ == mm ? | 40 | eors r3, ip, r3 @ == mm ? |
40 | movne pc, lr @ no, we dont do anything | 41 | retne lr @ no, we dont do anything |
41 | mov r3, #0 | 42 | mov r3, #0 |
42 | mcr p15, 0, r3, c7, c10, 4 @ drain WB | 43 | mcr p15, 0, r3, c7, c10, 4 @ drain WB |
43 | bic r0, r0, #0x0ff | 44 | bic r0, r0, #0x0ff |
@@ -47,7 +48,7 @@ ENTRY(fa_flush_user_tlb_range) | |||
47 | cmp r0, r1 | 48 | cmp r0, r1 |
48 | blo 1b | 49 | blo 1b |
49 | mcr p15, 0, r3, c7, c10, 4 @ data write barrier | 50 | mcr p15, 0, r3, c7, c10, 4 @ data write barrier |
50 | mov pc, lr | 51 | ret lr |
51 | 52 | ||
52 | 53 | ||
53 | ENTRY(fa_flush_kern_tlb_range) | 54 | ENTRY(fa_flush_kern_tlb_range) |
@@ -61,7 +62,7 @@ ENTRY(fa_flush_kern_tlb_range) | |||
61 | blo 1b | 62 | blo 1b |
62 | mcr p15, 0, r3, c7, c10, 4 @ data write barrier | 63 | mcr p15, 0, r3, c7, c10, 4 @ data write barrier |
63 | mcr p15, 0, r3, c7, c5, 4 @ prefetch flush (isb) | 64 | mcr p15, 0, r3, c7, c5, 4 @ prefetch flush (isb) |
64 | mov pc, lr | 65 | ret lr |
65 | 66 | ||
66 | __INITDATA | 67 | __INITDATA |
67 | 68 | ||