From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 20 Feb 2013 02:14:45 +0000 (+1100)
Subject: memcg-reduce-the-size-of-struct-memcg-244-fold-fix-fix
X-Git-Tag: next-20130220~1^2~447
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=881c4807dc28206c1f4b49abb9004f4db71a2ed2;p=karo-tx-linux.git

memcg-reduce-the-size-of-struct-memcg-244-fold-fix-fix

oops

Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Glauber Costa <glommer@parallels.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 9e94bbbd3a67..ae0433885b69 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -363,7 +363,7 @@ struct mem_cgroup {
 	struct mem_cgroup_lru_info info;
 };
 
-static inline size_t memcg_size(void)
+static size_t memcg_size(void)
 {
 	return sizeof(struct mem_cgroup) +
 		nr_node_ids * sizeof(struct mem_cgroup_per_node);
@@ -381,7 +381,7 @@ enum {
 		((1 << KMEM_ACCOUNTED_ACTIVE) | (1 << KMEM_ACCOUNTED_ACTIVATED))
 
 #ifdef CONFIG_MEMCG_KMEM
-static void memcg_kmem_set_active(struct mem_cgroup *memcg)
+static inline void memcg_kmem_set_active(struct mem_cgroup *memcg)
 {
 	set_bit(KMEM_ACCOUNTED_ACTIVE, &memcg->kmem_account_flags);
 }