From 27ef5b0f0dd0bdf01e06292eea305ef39a014016 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hughd@google.com>
Date: Fri, 22 Feb 2013 16:35:50 -0800
Subject: [PATCH] --- yaml --- r: 356617 b: refs/heads/master c:
 6d04399040ca9058c12c766bbbefbf6acdb2eabe h: refs/heads/master i:   356615:
 f89568d3e6ab6e1158f95f5bc6060e07c4468373 v: v3

---
 [refs]                | 2 +-
 trunk/mm/memcontrol.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4bb99c530ca5..f8b9bb333062 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7293bfba03e8283e29558c20aee279642f619c43
+refs/heads/master: 6d04399040ca9058c12c766bbbefbf6acdb2eabe
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index d4f0a831c9e6..53b8201b31eb 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -5025,6 +5025,7 @@ static int memcg_update_kmem_limit(struct cgroup *cont, u64 val)
 	return ret;
 }
 
+#ifdef CONFIG_MEMCG_KMEM
 static int memcg_propagate_kmem(struct mem_cgroup *memcg)
 {
 	int ret = 0;
@@ -5033,7 +5034,6 @@ static int memcg_propagate_kmem(struct mem_cgroup *memcg)
 		goto out;
 
 	memcg->kmem_account_flags = parent->kmem_account_flags;
-#ifdef CONFIG_MEMCG_KMEM
 	/*
 	 * When that happen, we need to disable the static branch only on those
 	 * memcgs that enabled it. To achieve this, we would be forced to
@@ -5059,10 +5059,10 @@ static int memcg_propagate_kmem(struct mem_cgroup *memcg)
 	mutex_lock(&set_limit_mutex);
 	ret = memcg_update_cache_sizes(memcg);
 	mutex_unlock(&set_limit_mutex);
-#endif
 out:
 	return ret;
 }
+#endif /* CONFIG_MEMCG_KMEM */
 
 /*
  * The user of this function is...