1 files changed, 13 insertions, 2 deletions

diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
index aa1eee06420f..d3ebf2e61853 100644
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
@@ -12,6 +12,9 @@
 #include <linux/vmstat.h>
 #include <linux/atomic.h>
 #include <linux/vmalloc.h>
+#ifdef CONFIG_CMA
+#include <linux/cma.h>
+#endif
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include "internal.h"
@@ -138,6 +141,10 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
                 "AnonHugePages:  %8lu kB\n"
 #endif
+#ifdef CONFIG_CMA
+                "CmaTotal:       %8lu kB\n"
+                "CmaFree:        %8lu kB\n"
+#endif
                 ,
                 K(i.totalram),
                 K(i.freeram),
@@ -187,12 +194,16 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
                 vmi.used >> 10,
                 vmi.largest_chunk >> 10
 #ifdef CONFIG_MEMORY_FAILURE
-                ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
+                , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
 #endif
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-                ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
+                , K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
                    HPAGE_PMD_NR)
 #endif
+#ifdef CONFIG_CMA
+                , K(totalcma_pages)
+                , K(global_page_state(NR_FREE_CMA_PAGES))
+#endif
                 );
 
         hugetlb_report_meminfo(m);