lib/show_mem.c: add cma reserved information
authorVishnu Pratap Singh <vishnu.ps@samsung.com>
Fri, 19 Dec 2014 00:17:21 +0000 (16:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Dec 2014 03:08:10 +0000 (19:08 -0800)
Add cma reserved information which is currently shown as a part of total
reserved only.  This patch is continuation of our previous cma patches
related to this.

  https://lkml.org/lkml/2014/10/20/64
  https://lkml.org/lkml/2014/10/22/383

[akpm@linux-foundation.org: remove hopefully-unneeded ifdefs]
Signed-off-by: Vishnu Pratap Singh <vishnu.ps@samsung.com>
Cc: David Rientjes <rientjes@google.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Xishi Qiu <qiuxishi@huawei.com>
Cc: Pintu Kumar <pintu.k@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
lib/show_mem.c

index 5e256271b47b02b1a0265ad6a89b2bccf5c40002..7de89f4a36cfa54dd01980898a4646f7c41ec550 100644 (file)
@@ -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());