diff options
Diffstat (limited to 'arch/sh/mm/tlb-flush.c')
-rw-r--r-- | arch/sh/mm/tlb-flush.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/sh/mm/tlb-flush.c b/arch/sh/mm/tlb-flush.c index b829c17c1d17..dcaf98e82be8 100644 --- a/arch/sh/mm/tlb-flush.c +++ b/arch/sh/mm/tlb-flush.c | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <asm/tlbflush.h> | 14 | #include <asm/tlbflush.h> |
15 | #include <asm/cacheflush.h> | 15 | #include <asm/cacheflush.h> |
16 | 16 | ||
17 | void flush_tlb_page(struct vm_area_struct *vma, unsigned long page) | 17 | void local_flush_tlb_page(struct vm_area_struct *vma, unsigned long page) |
18 | { | 18 | { |
19 | unsigned int cpu = smp_processor_id(); | 19 | unsigned int cpu = smp_processor_id(); |
20 | 20 | ||
@@ -31,15 +31,15 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long page) | |||
31 | saved_asid = get_asid(); | 31 | saved_asid = get_asid(); |
32 | set_asid(asid); | 32 | set_asid(asid); |
33 | } | 33 | } |
34 | __flush_tlb_page(asid, page); | 34 | flush_tlb_one(asid, page); |
35 | if (saved_asid != MMU_NO_ASID) | 35 | if (saved_asid != MMU_NO_ASID) |
36 | set_asid(saved_asid); | 36 | set_asid(saved_asid); |
37 | local_irq_restore(flags); | 37 | local_irq_restore(flags); |
38 | } | 38 | } |
39 | } | 39 | } |
40 | 40 | ||
41 | void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, | 41 | void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start, |
42 | unsigned long end) | 42 | unsigned long end) |
43 | { | 43 | { |
44 | struct mm_struct *mm = vma->vm_mm; | 44 | struct mm_struct *mm = vma->vm_mm; |
45 | unsigned int cpu = smp_processor_id(); | 45 | unsigned int cpu = smp_processor_id(); |
@@ -67,7 +67,7 @@ void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, | |||
67 | set_asid(asid); | 67 | set_asid(asid); |
68 | } | 68 | } |
69 | while (start < end) { | 69 | while (start < end) { |
70 | __flush_tlb_page(asid, start); | 70 | flush_tlb_one(asid, start); |
71 | start += PAGE_SIZE; | 71 | start += PAGE_SIZE; |
72 | } | 72 | } |
73 | if (saved_asid != MMU_NO_ASID) | 73 | if (saved_asid != MMU_NO_ASID) |
@@ -77,7 +77,7 @@ void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, | |||
77 | } | 77 | } |
78 | } | 78 | } |
79 | 79 | ||
80 | void flush_tlb_kernel_range(unsigned long start, unsigned long end) | 80 | void local_flush_tlb_kernel_range(unsigned long start, unsigned long end) |
81 | { | 81 | { |
82 | unsigned int cpu = smp_processor_id(); | 82 | unsigned int cpu = smp_processor_id(); |
83 | unsigned long flags; | 83 | unsigned long flags; |
@@ -86,7 +86,7 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end) | |||
86 | local_irq_save(flags); | 86 | local_irq_save(flags); |
87 | size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; | 87 | size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; |
88 | if (size > (MMU_NTLB_ENTRIES/4)) { /* Too many TLB to flush */ | 88 | if (size > (MMU_NTLB_ENTRIES/4)) { /* Too many TLB to flush */ |
89 | flush_tlb_all(); | 89 | local_flush_tlb_all(); |
90 | } else { | 90 | } else { |
91 | unsigned long asid; | 91 | unsigned long asid; |
92 | unsigned long saved_asid = get_asid(); | 92 | unsigned long saved_asid = get_asid(); |
@@ -97,7 +97,7 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end) | |||
97 | end &= PAGE_MASK; | 97 | end &= PAGE_MASK; |
98 | set_asid(asid); | 98 | set_asid(asid); |
99 | while (start < end) { | 99 | while (start < end) { |
100 | __flush_tlb_page(asid, start); | 100 | flush_tlb_one(asid, start); |
101 | start += PAGE_SIZE; | 101 | start += PAGE_SIZE; |
102 | } | 102 | } |
103 | set_asid(saved_asid); | 103 | set_asid(saved_asid); |
@@ -105,7 +105,7 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end) | |||
105 | local_irq_restore(flags); | 105 | local_irq_restore(flags); |
106 | } | 106 | } |
107 | 107 | ||
108 | void flush_tlb_mm(struct mm_struct *mm) | 108 | void local_flush_tlb_mm(struct mm_struct *mm) |
109 | { | 109 | { |
110 | unsigned int cpu = smp_processor_id(); | 110 | unsigned int cpu = smp_processor_id(); |
111 | 111 | ||
@@ -122,7 +122,7 @@ void flush_tlb_mm(struct mm_struct *mm) | |||
122 | } | 122 | } |
123 | } | 123 | } |
124 | 124 | ||
125 | void flush_tlb_all(void) | 125 | void local_flush_tlb_all(void) |
126 | { | 126 | { |
127 | unsigned long flags, status; | 127 | unsigned long flags, status; |
128 | 128 | ||