diff options
Diffstat (limited to 'include/asm-arm/tlb.h')
-rw-r--r-- | include/asm-arm/tlb.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/include/asm-arm/tlb.h b/include/asm-arm/tlb.h index a35ab0f2e25e..f49bfb78c221 100644 --- a/include/asm-arm/tlb.h +++ b/include/asm-arm/tlb.h | |||
@@ -27,11 +27,7 @@ | |||
27 | */ | 27 | */ |
28 | struct mmu_gather { | 28 | struct mmu_gather { |
29 | struct mm_struct *mm; | 29 | struct mm_struct *mm; |
30 | unsigned int freed; | ||
31 | unsigned int fullmm; | 30 | unsigned int fullmm; |
32 | |||
33 | unsigned int flushes; | ||
34 | unsigned int avoided_flushes; | ||
35 | }; | 31 | }; |
36 | 32 | ||
37 | DECLARE_PER_CPU(struct mmu_gather, mmu_gathers); | 33 | DECLARE_PER_CPU(struct mmu_gather, mmu_gathers); |
@@ -42,7 +38,6 @@ tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush) | |||
42 | struct mmu_gather *tlb = &get_cpu_var(mmu_gathers); | 38 | struct mmu_gather *tlb = &get_cpu_var(mmu_gathers); |
43 | 39 | ||
44 | tlb->mm = mm; | 40 | tlb->mm = mm; |
45 | tlb->freed = 0; | ||
46 | tlb->fullmm = full_mm_flush; | 41 | tlb->fullmm = full_mm_flush; |
47 | 42 | ||
48 | return tlb; | 43 | return tlb; |
@@ -51,16 +46,8 @@ tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush) | |||
51 | static inline void | 46 | static inline void |
52 | tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end) | 47 | tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end) |
53 | { | 48 | { |
54 | struct mm_struct *mm = tlb->mm; | ||
55 | unsigned long freed = tlb->freed; | ||
56 | int rss = get_mm_counter(mm, rss); | ||
57 | |||
58 | if (rss < freed) | ||
59 | freed = rss; | ||
60 | add_mm_counter(mm, rss, -freed); | ||
61 | |||
62 | if (tlb->fullmm) | 49 | if (tlb->fullmm) |
63 | flush_tlb_mm(mm); | 50 | flush_tlb_mm(tlb->mm); |
64 | 51 | ||
65 | /* keep the page table cache within bounds */ | 52 | /* keep the page table cache within bounds */ |
66 | check_pgt_cache(); | 53 | check_pgt_cache(); |