From 1dd40c6cb474944c70cd0c78fec837087ec4442c Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Fri, 3 Feb 2012 15:37:14 -0800
Subject: [PATCH] --- yaml --- r: 287213 b: refs/heads/master c:
 82b3f2a7171731cce62f25058d25afb91a14710c h: refs/heads/master i:   287211:
 2a4752175244c99979a64337131d9f7d2f77b8a4 v: v3

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

diff --git a/[refs] b/[refs]
index ae19b66fb919..68685f282489 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31e0017e6f6fb5cfdfaf932c1f98c9bef8d57688
+refs/heads/master: 82b3f2a7171731cce62f25058d25afb91a14710c
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 556859fec4ef..6728a7ae6f2d 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -776,7 +776,8 @@ static void memcg_check_events(struct mem_cgroup *memcg, struct page *page)
 	/* threshold event is triggered in finer grain than soft limit */
 	if (unlikely(mem_cgroup_event_ratelimit(memcg,
 						MEM_CGROUP_TARGET_THRESH))) {
-		bool do_softlimit, do_numainfo;
+		bool do_softlimit;
+		bool do_numainfo __maybe_unused;
 
 		do_softlimit = mem_cgroup_event_ratelimit(memcg,
 						MEM_CGROUP_TARGET_SOFTLIMIT);