Commit 49abd8c2 authored by Vishnu Pratap Singh's avatar Vishnu Pratap Singh Committed by Linus Torvalds

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: default avatarVishnu 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 47f8f929
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/nmi.h> #include <linux/nmi.h>
#include <linux/quicklist.h> #include <linux/quicklist.h>
#include <linux/cma.h>
void show_mem(unsigned int filter) void show_mem(unsigned int filter)
{ {
...@@ -38,7 +39,12 @@ 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 RAM\n", total);
printk("%lu pages HighMem/MovableOnly\n", highmem); 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); printk("%lu pages reserved\n", reserved);
#endif
#ifdef CONFIG_QUICKLIST #ifdef CONFIG_QUICKLIST
printk("%lu pages in pagetable cache\n", printk("%lu pages in pagetable cache\n",
quicklist_total_size()); quicklist_total_size());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment