[PATCH] clean up the TLB takedown code, remove debug

- Remove the temp /proc/meminfo stats

- Make the mmu_gather_t be 2048 bytes again

- Removed unused variable (Oleg Nesterov)

diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 7289526aaace5b015d3f1f91dc82575f759767df..e2e4c62c281093492f1bfd63782e591839bcf7fd 100644 (file)
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -136,16 +136,8 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
        struct sysinfo i;
        int len, committed;
        struct page_state ps;
-       int cpu;
        unsigned long inactive;
        unsigned long active;
-       unsigned long flushes = 0;
-       unsigned long non_flushes = 0;
-
-       for (cpu = 0; cpu < NR_CPUS; cpu++) {
-               flushes += mmu_gathers[cpu].flushes;
-               non_flushes += mmu_gathers[cpu].avoided_flushes;
-       }
 
        get_page_state(&ps);
        get_zone_counts(&active, &inactive);
@@ -181,9 +173,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
                "Mapped:       %8lu kB\n"
                "Committed_AS: %8u kB\n"
                "PageTables:   %8lu kB\n"
-               "ReverseMaps:  %8lu\n"
-               "TLB flushes:  %8lu\n"
-               "non flushes:  %8lu\n",
+               "ReverseMaps:  %8lu\n",
                K(i.totalram),
                K(i.freeram),
                K(i.sharedram),
@@ -203,9 +193,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
                K(ps.nr_mapped),
                K(committed),
                K(ps.nr_page_table_pages),
-               ps.nr_reverse_maps,
-               flushes,
-               non_flushes
+               ps.nr_reverse_maps
                );
 
 #ifdef CONFIG_HUGETLB_PAGE

diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
index f3564a558be4d20a7bcf35091d9529a773e1eca9..43814335a1a56e19d8ad38cceaa2b36cfec53283 100644 (file)
--- a/include/asm-generic/tlb.h
+++ b/include/asm-generic/tlb.h
@@ -21,7 +21,7 @@
  * and page free order so much..
  */
 #ifdef CONFIG_SMP
-  #define FREE_PTE_NR  507
+  #define FREE_PTE_NR  506
   #define tlb_fast_mode(tlb) ((tlb)->nr == ~0U)
 #else
   #define FREE_PTE_NR  1
@@ -40,8 +40,6 @@ typedef struct free_pte_ctx {
        unsigned int            fullmm; /* non-zero means full mm flush */
        unsigned long           freed;
        struct page *           pages[FREE_PTE_NR];
-       unsigned long           flushes;/* stats: count avoided flushes */
-       unsigned long           avoided_flushes;
 } mmu_gather_t;
 
 /* Users of the generic TLB shootdown code must declare this storage space. */
@@ -67,17 +65,10 @@ static inline mmu_gather_t *tlb_gather_mmu(struct mm_struct *mm, unsigned int fu
 
 static inline void tlb_flush_mmu(mmu_gather_t *tlb, unsigned long start, unsigned long end)
 {
-       unsigned long nr;
-
-       if (!tlb->need_flush) {
-               tlb->avoided_flushes++;
+       if (!tlb->need_flush)
                return;
-       }
        tlb->need_flush = 0;
-       tlb->flushes++;
-
        tlb_flush(tlb);
-       nr = tlb->nr;
        if (!tlb_fast_mode(tlb)) {
                free_pages_and_swap_cache(tlb->pages, tlb->nr);
                tlb->nr = 0;