mm, show_mem: suppress page counts in non-blockable contexts

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / parisc / mm / init.c

diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 3ac462de53a4f5f63882a471d197fe90999882ca..cf2da13c41e6a8026a017fbd73905da6e89a51e0 100644 (file)
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -697,6 +697,8 @@ void show_mem(unsigned int filter)
 
        printk(KERN_INFO "Mem-info:\n");
        show_free_areas(filter);
+       if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
+               return;
 #ifndef CONFIG_DISCONTIGMEM
        i = max_mapnr;
        while (i-- > 0) {