netpoll: fix the skb check in pkt_is_ns

[~andy/linux] / lib / show_mem.c

diff --git a/lib/show_mem.c b/lib/show_mem.c
index 5847a4921b8ee25f5fd88624cd74970da371f2ca..09225796991a83a9281194d855719021b8b18282 100644 (file)
--- a/lib/show_mem.c
+++ b/lib/show_mem.c
@@ -17,9 +17,6 @@ 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 flags;
                int zoneid;
@@ -46,4 +43,7 @@ void show_mem(unsigned int filter)
        printk("%lu pages in pagetable cache\n",
                quicklist_total_size());
 #endif
+#ifdef CONFIG_MEMORY_FAILURE
+       printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
+#endif
 }