diff options
Diffstat (limited to 'arch/arm/mm/tlb-v4wbi.S')
-rw-r--r-- | arch/arm/mm/tlb-v4wbi.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mm/tlb-v4wbi.S b/arch/arm/mm/tlb-v4wbi.S index 1f6062b6c1c1..058861548f68 100644 --- a/arch/arm/mm/tlb-v4wbi.S +++ b/arch/arm/mm/tlb-v4wbi.S | |||
@@ -14,6 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | #include <linux/linkage.h> | 15 | #include <linux/linkage.h> |
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <asm/assembler.h> | ||
17 | #include <asm/asm-offsets.h> | 18 | #include <asm/asm-offsets.h> |
18 | #include <asm/tlbflush.h> | 19 | #include <asm/tlbflush.h> |
19 | #include "proc-macros.S" | 20 | #include "proc-macros.S" |
@@ -32,7 +33,7 @@ ENTRY(v4wbi_flush_user_tlb_range) | |||
32 | vma_vm_mm ip, r2 | 33 | vma_vm_mm ip, r2 |
33 | act_mm r3 @ get current->active_mm | 34 | act_mm r3 @ get current->active_mm |
34 | eors r3, ip, r3 @ == mm ? | 35 | eors r3, ip, r3 @ == mm ? |
35 | movne pc, lr @ no, we dont do anything | 36 | retne lr @ no, we dont do anything |
36 | mov r3, #0 | 37 | mov r3, #0 |
37 | mcr p15, 0, r3, c7, c10, 4 @ drain WB | 38 | mcr p15, 0, r3, c7, c10, 4 @ drain WB |
38 | vma_vm_flags r2, r2 | 39 | vma_vm_flags r2, r2 |
@@ -44,7 +45,7 @@ ENTRY(v4wbi_flush_user_tlb_range) | |||
44 | add r0, r0, #PAGE_SZ | 45 | add r0, r0, #PAGE_SZ |
45 | cmp r0, r1 | 46 | cmp r0, r1 |
46 | blo 1b | 47 | blo 1b |
47 | mov pc, lr | 48 | ret lr |
48 | 49 | ||
49 | ENTRY(v4wbi_flush_kern_tlb_range) | 50 | ENTRY(v4wbi_flush_kern_tlb_range) |
50 | mov r3, #0 | 51 | mov r3, #0 |
@@ -56,7 +57,7 @@ ENTRY(v4wbi_flush_kern_tlb_range) | |||
56 | add r0, r0, #PAGE_SZ | 57 | add r0, r0, #PAGE_SZ |
57 | cmp r0, r1 | 58 | cmp r0, r1 |
58 | blo 1b | 59 | blo 1b |
59 | mov pc, lr | 60 | ret lr |
60 | 61 | ||
61 | __INITDATA | 62 | __INITDATA |
62 | 63 | ||