These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / lib / show_mem.c

diff --git a/kernel/lib/show_mem.c b/kernel/lib/show_mem.c
index adc98e1..1feed6a 100644 (file)
--- a/kernel/lib/show_mem.c
+++ b/kernel/lib/show_mem.c
@@ -38,11 +38,9 @@ void show_mem(unsigned int filter)
 
        printk("%lu pages RAM\n", total);
        printk("%lu pages HighMem/MovableOnly\n", highmem);
+       printk("%lu pages reserved\n", reserved);
 #ifdef CONFIG_CMA
-       printk("%lu pages reserved\n", (reserved - totalcma_pages));
        printk("%lu pages cma reserved\n", totalcma_pages);
-#else
-       printk("%lu pages reserved\n", reserved);
 #endif
 #ifdef CONFIG_QUICKLIST
        printk("%lu pages in pagetable cache\n",