[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120116084715.GA1639@tiehlicka.suse.cz>
Date: Mon, 16 Jan 2012 09:47:15 +0100
From: Michal Hocko <mhocko@...e.cz>
To: Li Zefan <lizf@...fujitsu.com>
Cc: linux-mm@...ck.org,
"bsingharora@...il.com" <bsingharora@...il.com>,
Hiroyuki KAMEZAWA <kamezawa.hiroyu@...fujitsu.com>,
Johannes Weiner <hannes@...xchg.org>,
Cgroups <cgroups@...r.kernel.org>,
LKML <linux-kernel@...r.kernel.org>,
"Kirill A. Shutemov" <kirill@...temov.name>
Subject: Re: [PATCH] memcg: fix compile warning on non-numa systems
On Mon 16-01-12 14:04:53, Li Zefan wrote:
> 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'
This has been already posted by Kirill and I didn't like the solution
(https://lkml.org/lkml/2011/12/27/86). He then reposted with a different
version (https://lkml.org/lkml/2012/1/6/281).
The later one looks better but I still think this is not worth
complicate the code just to get rid of this warning.
>
> Signed-off-by: Li Zefan <lizf@...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@...ck.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@...ck.org"> email@...ck.org </a>
--
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9
Czech Republic
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists