From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751438Ab2APGC2 (ORCPT ); Mon, 16 Jan 2012 01:02:28 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:54650 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1750728Ab2APGC0 (ORCPT ); Mon, 16 Jan 2012 01:02:26 -0500 Message-ID: <4F13BE05.70505@cn.fujitsu.com> Date: Mon, 16 Jan 2012 14:04:53 +0800 From: Li Zefan User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.9) Gecko/20100921 Fedora/3.1.4-1.fc14 Thunderbird/3.1.4 MIME-Version: 1.0 To: linux-mm@kvack.org CC: Michal Hocko , "bsingharora@gmail.com" , Hiroyuki KAMEZAWA , Johannes Weiner , linux-mm@kvack.org, Cgroups , LKML Subject: [PATCH] memcg: fix compile warning on non-numa systems X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2012-01-16 14:01:14, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2012-01-16 14:01:16, Serialize complete at 2012-01-16 14:01:16 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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