Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/lib/show_mem.c b/lib/show_mem.c
index 4407f8c9b1f71046d8b4aec0519734491b8bdd2a..b7c72311ad0c88673546aa910c32cdc5214f96b2 100644 (file)
--- a/lib/show_mem.c
+++ b/lib/show_mem.c
@@ -18,6 +18,9 @@ void show_mem(unsigned int filter)
        printk("Mem-Info:\n");
        show_free_areas(filter);
 
+       if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
+               return;
+
        for_each_online_pgdat(pgdat) {
                unsigned long i, flags;