summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorGregory Fong <gregory.0xf0@gmail.com>2015-08-14 15:35:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-14 15:56:32 -0700
commitf21838e056ebc499f5d6ca4cb734e82cf9c275a5 (patch)
treea5e3f2c700e7ca8639128de9c42dea5fcb76e2fa /mm
parent4ce321f574a97f3453bca5a4117610b43dabd3ee (diff)
mm: cma: mark cma_bitmap_maxno() inline in header
cma_bitmap_maxno() was marked as static and not static inline, which can cause warnings about this function not being used if this file is included in a file that does not call that function, and violates the conventions used elsewhere. The two options are to move the function implementation back to mm/cma.c or make it inline here, and it's simple enough for the latter to make sense. Signed-off-by: Gregory Fong <gregory.0xf0@gmail.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Sasha Levin <sasha.levin@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/cma.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/cma.h b/mm/cma.h
index 1132d733556d..17c75a4246c8 100644
--- a/mm/cma.h
+++ b/mm/cma.h
@@ -16,7 +16,7 @@ struct cma {
extern struct cma cma_areas[MAX_CMA_AREAS];
extern unsigned cma_area_count;
-static unsigned long cma_bitmap_maxno(struct cma *cma)
+static inline unsigned long cma_bitmap_maxno(struct cma *cma)
{
return cma->count >> cma->order_per_bit;
}