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

Move the code from cma_get_used() and cma_get_maxchunk() to cma_used_get()
and cma_maxchunk_get(), because cma_get_*() aren't used anywhere else, and
because of their confusing similar names.

Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
Cc: Dmitry Safonov <d.safonov@partner.samsung.com>
Cc: Michal Nazarewicz <mina86@mina86.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/mm/cma_debug.c b/mm/cma_debug.c
index 7dd593a4e9dcba1f26d4920bcd22fc6a603c5b92..835e761d944abf5fb8302df6023433506c041aad 100644 (file)
--- a/mm/cma_debug.c
+++ b/mm/cma_debug.c
@@ -22,37 +22,6 @@ 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;
@@ -67,8 +36,13 @@ DEFINE_SIMPLE_ATTRIBUTE(cma_debugfs_fops, cma_debugfs_get, NULL, "%llu\n");
 static int cma_used_get(void *data, u64 *val)
 {
        struct cma *cma = data;
+       unsigned long used;
 
-       *val = cma_get_used(cma);
+       mutex_lock(&cma->lock);
+       /* pages counter is smaller than sizeof(int) */
+       used = bitmap_weight(cma->bitmap, (int)cma->count);
+       mutex_unlock(&cma->lock);
+       *val = used << cma->order_per_bit;
 
        return 0;
 }
@@ -78,8 +52,19 @@ DEFINE_SIMPLE_ATTRIBUTE(cma_used_fops, cma_used_get, NULL, "%llu\n");
 static int cma_maxchunk_get(void *data, u64 *val)
 {
        struct cma *cma = data;
+       unsigned long maxchunk = 0;
+       unsigned long start, end = 0;
 
-       *val = cma_get_maxchunk(cma);
+       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);
+       *val = maxchunk << cma->order_per_bit;
 
        return 0;
 }