Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...

[android-x86/kernel.git] / lib / show_mem.c

diff --git a/lib/show_mem.c b/lib/show_mem.c
index d8d602b..4407f8c 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(unsigned int filter)
+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(filter);
+       show_free_areas(filter);
 
        for_each_online_pgdat(pgdat) {
                unsigned long i, flags;
@@ -61,8 +61,3 @@ void __show_mem(unsigned int filter)
                quicklist_total_size());
 #endif
 }
-
-void show_mem(void)
-{
-       __show_mem(0);
-}