The patch titled Subject: lib/show_mem.c: add cma reserved information has been removed from the -mm tree. Its filename was lib-show_mem-this-patch-adds-cma-reserved-infromation.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Vishnu Pratap Singh <vishnu.ps@xxxxxxxxxxx> Subject: 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@xxxxxxxxxxxxxxxxxxxx: remove hopefully-unneeded ifdefs] Signed-off-by: Vishnu Pratap Singh <vishnu.ps@xxxxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Cc: Xishi Qiu <qiuxishi@xxxxxxxxxx> Cc: Pintu Kumar <pintu.k@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/show_mem.c | 6 ++++++ 1 file changed, 6 insertions(+) diff -puN lib/show_mem.c~lib-show_mem-this-patch-adds-cma-reserved-infromation lib/show_mem.c --- a/lib/show_mem.c~lib-show_mem-this-patch-adds-cma-reserved-infromation +++ a/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()); _ Patches currently in -mm which might be from vishnu.ps@xxxxxxxxxxx are origin.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html