Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[firefly-linux-kernel-4.4.55.git] / lib / show_mem.c

diff --git a/lib/show_mem.c b/lib/show_mem.c
index 238e72a18ce1ea7ee0d1849a18d40ae56af5c121..90cbe4bb5960fc480eaf45273638159ac48d2aa7 100644 (file)
--- 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(KERN_INFO "Mem-Info:\n");
-       show_free_areas();
+       printk("Mem-Info:\n");
+       __show_free_areas(filter);
 
        for_each_online_pgdat(pgdat) {
                unsigned long i, flags;
@@ -49,15 +49,15 @@ void show_mem(void)
                pgdat_resize_unlock(pgdat, &flags);
        }
 
-       printk(KERN_INFO "%lu pages RAM\n", total);
+       printk("%lu pages RAM\n", total);
 #ifdef CONFIG_HIGHMEM
-       printk(KERN_INFO "%lu pages HighMem\n", highmem);
+       printk("%lu pages HighMem\n", highmem);
 #endif
-       printk(KERN_INFO "%lu pages reserved\n", reserved);
-       printk(KERN_INFO "%lu pages shared\n", shared);
-       printk(KERN_INFO "%lu pages non-shared\n", nonshared);
+       printk("%lu pages reserved\n", reserved);
+       printk("%lu pages shared\n", shared);
+       printk("%lu pages non-shared\n", nonshared);
 #ifdef CONFIG_QUICKLIST
-       printk(KERN_INFO "%lu pages in pagetable cache\n",
+       printk("%lu pages in pagetable cache\n",
                quicklist_total_size());
 #endif
 }