Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for...

[firefly-linux-kernel-4.4.55.git] / mm / memcontrol.c

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index a5470674a4772af204083071023ec58c9a404855..9acfb165eb52eeff2271888ec61fe093c9015641 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2801,7 +2801,7 @@ static unsigned long tree_stat(struct mem_cgroup *memcg,
        return val;
 }
 
-static inline unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap)
+static unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap)
 {
        unsigned long val;