From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx123.postini.com [74.125.245.123]) by kanga.kvack.org (Postfix) with SMTP id 78C8B6B004F for ; Mon, 16 Jan 2012 01:02:24 -0500 (EST) Message-ID: <4F13BE05.70505@cn.fujitsu.com> Date: Mon, 16 Jan 2012 14:04:53 +0800 From: Li Zefan MIME-Version: 1.0 Subject: [PATCH] memcg: fix compile warning on non-numa systems Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=UTF-8 Sender: owner-linux-mm@kvack.org List-ID: To: linux-mm@kvack.org Cc: Michal Hocko , "bsingharora@gmail.com" , Hiroyuki KAMEZAWA , Johannes Weiner , 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 --- 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: email@kvack.org