mm: completely remove dumping per-cpu lists from show_mem()

It seems nobody needs this.

Signed-off-by: Konstantin Khlebnikov <koct9i@gmail.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 9c21b42d07bfbc97e47a324ba84583b3f8d5d4ef..6571dd78e984e64db0311d747093f696aa4079ce 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1126,7 +1126,6 @@ extern void pagefault_out_of_memory(void);
  * various contexts.
  */
 #define SHOW_MEM_FILTER_NODES          (0x0001u)       /* disallowed nodes */
-#define SHOW_MEM_PERCPU_LISTS          (0x0002u)       /* per-zone per-cpu */
 
 extern void show_free_areas(unsigned int flags);
 extern bool skip_free_areas_node(unsigned int flags, int nid);

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index eab8e2018a463498074a4654e5e804c4f5959fad..84466a4b1b364e3a07917a6b2edcbab23a9078e3 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3255,7 +3255,6 @@ static void show_migration_types(unsigned char type)
  * Bits in @filter:
  * SHOW_MEM_FILTER_NODES: suppress nodes that are not allowed by current's
  *   cpuset.
- * SHOW_MEM_PERCPU_LISTS: display full per-node per-cpu pcp lists
  */
 void show_free_areas(unsigned int filter)
 {
@@ -3267,25 +3266,8 @@ void show_free_areas(unsigned int filter)
                if (skip_free_areas_node(filter, zone_to_nid(zone)))
                        continue;
 
-               if (filter & SHOW_MEM_PERCPU_LISTS) {
-                       show_node(zone);
-                       printk("%s per-cpu:\n", zone->name);
-               }
-
-               for_each_online_cpu(cpu) {
-                       struct per_cpu_pageset *pageset;
-
-                       pageset = per_cpu_ptr(zone->pageset, cpu);
-
-                       free_pcp += pageset->pcp.count;
-
-                       if (!(filter & SHOW_MEM_PERCPU_LISTS))
-                               continue;
-
-                       printk("CPU %4d: hi:%5d, btch:%4d usd:%4d\n",
-                              cpu, pageset->pcp.high,
-                              pageset->pcp.batch, pageset->pcp.count);
-               }
+               for_each_online_cpu(cpu)
+                       free_pcp += per_cpu_ptr(zone->pageset, cpu)->pcp.count;
        }
 
        printk("active_anon:%lu inactive_anon:%lu isolated_anon:%lu\n"