Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/show_mem.c b/lib/show_mem.c
index fdc77c82f922..d8d602b58c31 100644
--- a/lib/show_mem.c
+++ b/lib/show_mem.c
@@ -9,14 +9,14 @@
 #include <linux/nmi.h>
 #include <linux/quicklist.h>
 
-void show_mem(void)
+void __show_mem(unsigned int filter)
 {
         pg_data_t *pgdat;
         unsigned long total = 0, reserved = 0, shared = 0,
                 nonshared = 0, highmem = 0;
 
         printk("Mem-Info:\n");
-        show_free_areas();
+        __show_free_areas(filter);
 
         for_each_online_pgdat(pgdat) {
                 unsigned long i, flags;
@@ -61,3 +61,8 @@ void show_mem(void)
                 quicklist_total_size());
 #endif
 }
+
+void show_mem(void)
+{
+        __show_mem(0);
+}