mm-cma-add-functions-to-get-region-pages-counters-fix

move debug code from cma.c into cma_debug.c so it doesn't get included in
CONFIG_CMA_DEBUGFS=n builds

Cc: Dmitry Safonov <d.safonov@partner.samsung.com>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Stefan Strogin <stefan.strogin@gmail.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Pintu Kumar <pintu.k@samsung.com>
Cc: Weijie Yang <weijie.yang@samsung.com>
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Cc: Vyacheslav Tyrtov <v.tyrtov@samsung.com>
Cc: Aleksei Mateosian <a.mateosian@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/cma.h b/include/linux/cma.h
index 1231f50f865e28637ee30d3abbe3e25f39691762..f7ef093ec49a2bbdd637aae6ab0f1bf0fa4e1e32 100644 (file)
--- a/include/linux/cma.h
+++ b/include/linux/cma.h
@@ -18,8 +18,6 @@ struct cma;
 extern unsigned long totalcma_pages;
 extern phys_addr_t cma_get_base(const struct cma *cma);
 extern unsigned long cma_get_size(const struct cma *cma);
-extern unsigned long cma_get_used(struct cma *cma);
-extern unsigned long cma_get_maxchunk(struct cma *cma);
 
 extern int __init cma_declare_contiguous(phys_addr_t base,
                        phys_addr_t size, phys_addr_t limit,

diff --git a/mm/cma.c b/mm/cma.c
index d839011e8c6f41a9bb45cfc47b901381fdf56605..3a7a67b933942f5232091094f5d719d59bda13ab 100644 (file)
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -53,36 +53,6 @@ unsigned long cma_get_size(const struct cma *cma)
        return cma->count << PAGE_SHIFT;
 }
 
-unsigned long cma_get_used(struct cma *cma)
-{
-       unsigned long ret = 0;
-
-       mutex_lock(&cma->lock);
-       /* pages counter is smaller than sizeof(int) */
-       ret = bitmap_weight(cma->bitmap, (int)cma->count);
-       mutex_unlock(&cma->lock);
-
-       return ret << cma->order_per_bit;
-}
-
-unsigned long cma_get_maxchunk(struct cma *cma)
-{
-       unsigned long maxchunk = 0;
-       unsigned long start, end = 0;
-
-       mutex_lock(&cma->lock);
-       for (;;) {
-               start = find_next_zero_bit(cma->bitmap, cma->count, end);
-               if (start >= cma->count)
-                       break;
-               end = find_next_bit(cma->bitmap, cma->count, start);
-               maxchunk = max(end - start, maxchunk);
-       }
-       mutex_unlock(&cma->lock);
-
-       return maxchunk << cma->order_per_bit;
-}
-
 static unsigned long cma_bitmap_aligned_mask(const struct cma *cma,
                                             int align_order)
 {

diff --git a/mm/cma_debug.c b/mm/cma_debug.c
index 984ceddf8d31e907a052c4c1754c9c94762a4acf..7dd593a4e9dcba1f26d4920bcd22fc6a603c5b92 100644 (file)
--- a/mm/cma_debug.c
+++ b/mm/cma_debug.c
@@ -22,6 +22,37 @@ struct cma_mem {
 
 static struct dentry *cma_debugfs_root;
 
+static unsigned long cma_get_used(struct cma *cma)
+{
+       unsigned long ret = 0;
+
+       mutex_lock(&cma->lock);
+       /* pages counter is smaller than sizeof(int) */
+       ret = bitmap_weight(cma->bitmap, (int)cma->count);
+       mutex_unlock(&cma->lock);
+
+       return ret << cma->order_per_bit;
+}
+
+static unsigned long cma_get_maxchunk(struct cma *cma)
+{
+       unsigned long maxchunk = 0;
+       unsigned long start, end = 0;
+
+       mutex_lock(&cma->lock);
+       for (;;) {
+               start = find_next_zero_bit(cma->bitmap, cma->count, end);
+               if (start >= cma->count)
+                       break;
+               end = find_next_bit(cma->bitmap, cma->count, start);
+               maxchunk = max(end - start, maxchunk);
+       }
+       mutex_unlock(&cma->lock);
+
+       return maxchunk << cma->order_per_bit;
+}
+
+
 static int cma_debugfs_get(void *data, u64 *val)
 {
        unsigned long *p = data;