X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=lib%2Fshow_mem.c;h=7de89f4a36cfa54dd01980898a4646f7c41ec550;hb=dd9553988879a3ff71a86323b88409e7631c4e5d;hp=5e256271b47b02b1a0265ad6a89b2bccf5c40002;hpb=2ec1c17cadd0b994732f292d4bc49fc3a05d85a4;p=cascardo%2Flinux.git

diff --git a/lib/show_mem.c b/lib/show_mem.c
index 5e256271b47b..7de89f4a36cf 100644
--- a/lib/show_mem.c
+++ b/lib/show_mem.c
@@ -8,6 +8,7 @@
 #include <linux/mm.h>
 #include <linux/nmi.h>
 #include <linux/quicklist.h>
+#include <linux/cma.h>
 
 void show_mem(unsigned int filter)
 {
@@ -38,7 +39,12 @@ void show_mem(unsigned int filter)
 
 	printk("%lu pages RAM\n", total);
 	printk("%lu pages HighMem/MovableOnly\n", highmem);
+#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",
 		quicklist_total_size());