All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] memcg: fix compile warning on non-numa systems
@ 2012-01-16  6:04 ` Li Zefan
  0 siblings, 0 replies; 13+ messages in thread
From: Li Zefan @ 2012-01-16  6:04 UTC (permalink / raw)
  Cc: Michal Hocko, bsingharora@gmail.com, Hiroyuki KAMEZAWA,
	Johannes Weiner, linux-mm, Cgroups, LKML

Fix this warning:

  CC      mm/memcontrol.o
mm/memcontrol.c: In function 'memcg_check_events':
mm/memcontrol.c:779:22: warning: unused variable 'do_numainfo'

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
 mm/memcontrol.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 602207b..c8aeab8 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -776,14 +776,16 @@ 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;
-
-		do_softlimit = mem_cgroup_event_ratelimit(memcg,
-						MEM_CGROUP_TARGET_SOFTLIMIT);
+		bool do_softlimit;
 #if MAX_NUMNODES > 1
+		bool do_numainfo;
+
 		do_numainfo = mem_cgroup_event_ratelimit(memcg,
 						MEM_CGROUP_TARGET_NUMAINFO);
 #endif
+
+		do_softlimit = mem_cgroup_event_ratelimit(memcg,
+						MEM_CGROUP_TARGET_SOFTLIMIT);
 		preempt_enable();
 
 		mem_cgroup_threshold(memcg);
-- 
1.7.3.1

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2012-01-26  9:01 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-16  6:04 [PATCH] memcg: fix compile warning on non-numa systems Li Zefan
2012-01-16  6:04 ` Li Zefan
2012-01-16  6:04 ` Li Zefan
     [not found] ` <4F13BE05.70505-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2012-01-16  8:47   ` Michal Hocko
2012-01-16  8:47     ` Michal Hocko
2012-01-16  8:47     ` Michal Hocko
     [not found]     ` <20120116084715.GA1639-VqjxzfR4DlwKmadIfiO5sKVXKuFTiq87@public.gmane.org>
2012-01-26  8:55       ` Andrew Morton
2012-01-26  8:55         ` Andrew Morton
2012-01-26  8:55         ` Andrew Morton
2012-01-26  8:54         ` Kirill A. Shutemov
2012-01-26  8:54           ` Kirill A. Shutemov
2012-01-26  9:01         ` Michal Hocko
2012-01-26  9:01           ` Michal Hocko

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.