summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorVishnu Pratap Singh <vishnu.ps@samsung.com>2014-12-18 16:17:21 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-18 19:08:10 -0800
commit49abd8c28046adf77c5ce1949549aa64d7221881 (patch)
tree713a9a2b8df92ecb774142cee88286db1cd59d5f /lib
parent47f8f9297d2247d65ee46d8403a73b30f8d0249b (diff)
downloadlinux-49abd8c28046adf77c5ce1949549aa64d7221881.tar.gz
linux-49abd8c28046adf77c5ce1949549aa64d7221881.tar.bz2
linux-49abd8c28046adf77c5ce1949549aa64d7221881.zip
lib/show_mem.c: add cma reserved information
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>
Diffstat (limited to 'lib')
-rw-r--r--lib/show_mem.c6
1 files changed, 6 insertions, 0 deletions
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());