arch, mm: filter disallowed nodes from arch specific show_mem functions

Architectures that implement their own show_mem() function did not pass
the filter argument to show_free_areas() to appropriately avoid emitting
the state of nodes that are disallowed in the current context.  This patch
now passes the filter argument to show_free_areas() so those nodes are now
avoided.

This patch also removes the show_free_areas() wrapper around
__show_free_areas() and converts existing callers to pass an empty filter.

ia64 emits additional information for each node, so skip_free_areas_zone()
must be made global to filter disallowed nodes and it is converted to use
a nid argument rather than a zone for this use case.

Signed-off-by: David Rientjes <rientjes@google.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Helge Deller <deller@gmx.de>
Cc: James Bottomley <jejb@parisc-linux.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

7 files changed, 17 insertions, 13 deletions

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 76f82ae44efb..3f17ea146f0e 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -85,7 +85,7 @@ void show_mem(unsigned int filter)
         struct meminfo * mi = &meminfo;
 
         printk("Mem-info:\n");
-        show_free_areas();
+        show_free_areas(filter);
 
         for_each_bank (i, mi) {
                 struct membank *bank = &mi->bank[i];
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 9a018cde5d84..f114a3b14c6a 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -44,13 +44,16 @@ void show_mem(unsigned int filter)
         pg_data_t *pgdat;
 
         printk(KERN_INFO "Mem-info:\n");
-        show_free_areas();
+        show_free_areas(filter);
         printk(KERN_INFO "Node memory in pages:\n");
         for_each_online_pgdat(pgdat) {
                 unsigned long present;
                 unsigned long flags;
                 int shared = 0, cached = 0, reserved = 0;
+                int nid = pgdat->node_id;
 
+                if (skip_free_areas_node(filter, nid))
+                        continue;
                 pgdat_resize_lock(pgdat, &flags);
                 present = pgdat->node_present_pages;
                 for(i = 0; i < pgdat->node_spanned_pages; i++) {
@@ -64,8 +67,7 @@ void show_mem(unsigned int filter)
                                 if (max_gap < LARGE_GAP)
                                         continue;
 #endif
-                                i = vmemmap_find_next_valid_pfn(pgdat->node_id,
-                                         i) - 1;
+                                i = vmemmap_find_next_valid_pfn(nid, i) - 1;
                                 continue;
                         }
                         if (PageReserved(page))
@@ -81,7 +83,7 @@ void show_mem(unsigned int filter)
                 total_cached += cached;
                 total_shared += shared;
                 printk(KERN_INFO "Node %4d:  RAM: %11ld, rsvd: %8d, "
-                       "shrd: %10d, swpd: %10d\n", pgdat->node_id,
+                       "shrd: %10d, swpd: %10d\n", nid,
                        present, reserved, shared, cached);
         }
         printk(KERN_INFO "%ld pages of RAM\n", total_present);
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 82ab1bc6afb1..c641333cd997 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -622,13 +622,16 @@ void show_mem(unsigned int filter)
         pg_data_t *pgdat;
 
         printk(KERN_INFO "Mem-info:\n");
-        show_free_areas();
+        show_free_areas(filter);
         printk(KERN_INFO "Node memory in pages:\n");
         for_each_online_pgdat(pgdat) {
                 unsigned long present;
                 unsigned long flags;
                 int shared = 0, cached = 0, reserved = 0;
+                int nid = pgdat->node_id;
 
+                if (skip_free_areas_node(filter, nid))
+                        continue;
                 pgdat_resize_lock(pgdat, &flags);
                 present = pgdat->node_present_pages;
                 for(i = 0; i < pgdat->node_spanned_pages; i++) {
@@ -638,8 +641,7 @@ void show_mem(unsigned int filter)
                         if (pfn_valid(pgdat->node_start_pfn + i))
                                 page = pfn_to_page(pgdat->node_start_pfn + i);
                         else {
-                                i = vmemmap_find_next_valid_pfn(pgdat->node_id,
-                                         i) - 1;
+                                i = vmemmap_find_next_valid_pfn(nid, i) - 1;
                                 continue;
                         }
                         if (PageReserved(page))
@@ -655,7 +657,7 @@ void show_mem(unsigned int filter)
                 total_cached += cached;
                 total_shared += shared;
                 printk(KERN_INFO "Node %4d:  RAM: %11ld, rsvd: %8d, "
-                       "shrd: %10d, swpd: %10d\n", pgdat->node_id,
+                       "shrd: %10d, swpd: %10d\n", nid,
                        present, reserved, shared, cached);
         }
         printk(KERN_INFO "%ld pages of RAM\n", total_present);
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 5fa1e273006e..c5c9c65e502d 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -686,7 +686,7 @@ void show_mem(unsigned int filter)
         int shared = 0, cached = 0;
 
         printk(KERN_INFO "Mem-info:\n");
-        show_free_areas();
+        show_free_areas(filter);
 #ifndef CONFIG_DISCONTIGMEM
         i = max_mapnr;
         while (i-- > 0) {
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c
index 3609bdee9ed2..3249d3f3234d 100644
--- a/arch/sparc/kernel/setup_32.c
+++ b/arch/sparc/kernel/setup_32.c
@@ -82,7 +82,7 @@ static void prom_sync_me(void)
                              "nop\n\t" : : "r" (&trapbase));
 
         prom_printf("PROM SYNC COMMAND...\n");
-        show_free_areas();
+        show_free_areas(0);
         if(current->pid != 0) {
                 local_irq_enable();
                 sys_sync();
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index 4c31e2b6e71b..28c2cc81c9a9 100644
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -78,7 +78,7 @@ void __init kmap_init(void)
 void show_mem(unsigned int filter)
 {
         printk("Mem-info:\n");
-        show_free_areas();
+        show_free_areas(filter);
         printk("Free swap:       %6ldkB\n",
                nr_swap_pages << (PAGE_SHIFT-10));
         printk("%ld pages of RAM\n", totalram_pages);
diff --git a/arch/unicore32/mm/init.c b/arch/unicore32/mm/init.c
index 1fc02633f700..2d3e7112d2a3 100644
--- a/arch/unicore32/mm/init.c
+++ b/arch/unicore32/mm/init.c
@@ -62,7 +62,7 @@ void show_mem(unsigned int filter)
         struct meminfo *mi = &meminfo;
 
         printk(KERN_DEFAULT "Mem-info:\n");
-        show_free_areas();
+        show_free_areas(filter);
 
         for_each_bank(i, mi) {
                 struct membank *bank = &mi->bank[i];