aboutsummaryrefslogtreecommitdiffstats
path: root/mm/nommu.c
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2011-05-24 20:11:16 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-25 11:39:03 -0400
commit7bf02ea22c6cdd09e2d3f1d3c3fe366b834ae9af (patch)
treec1c8aa415910e0f0deea1181759ddd2b5d6067fb /mm/nommu.c
parent851cc856d73d1185243c149ed0c0839df8a1b2fe (diff)
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>
Diffstat (limited to 'mm/nommu.c')
-rw-r--r--mm/nommu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/nommu.c b/mm/nommu.c
index c4c542c736a9..5afce48ce339 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1235,7 +1235,7 @@ error_free:
1235enomem: 1235enomem:
1236 printk("Allocation of length %lu from process %d (%s) failed\n", 1236 printk("Allocation of length %lu from process %d (%s) failed\n",
1237 len, current->pid, current->comm); 1237 len, current->pid, current->comm);
1238 show_free_areas(); 1238 show_free_areas(0);
1239 return -ENOMEM; 1239 return -ENOMEM;
1240} 1240}
1241 1241
@@ -1468,14 +1468,14 @@ error_getting_vma:
1468 printk(KERN_WARNING "Allocation of vma for %lu byte allocation" 1468 printk(KERN_WARNING "Allocation of vma for %lu byte allocation"
1469 " from process %d failed\n", 1469 " from process %d failed\n",
1470 len, current->pid); 1470 len, current->pid);
1471 show_free_areas(); 1471 show_free_areas(0);
1472 return -ENOMEM; 1472 return -ENOMEM;
1473 1473
1474error_getting_region: 1474error_getting_region:
1475 printk(KERN_WARNING "Allocation of vm region for %lu byte allocation" 1475 printk(KERN_WARNING "Allocation of vm region for %lu byte allocation"
1476 " from process %d failed\n", 1476 " from process %d failed\n",
1477 len, current->pid); 1477 len, current->pid);
1478 show_free_areas(); 1478 show_free_areas(0);
1479 return -ENOMEM; 1479 return -ENOMEM;
1480} 1480}
1481EXPORT_SYMBOL(do_mmap_pgoff); 1481EXPORT_SYMBOL(do_mmap_pgoff);