Re: [PATCH 1/6] memcg: fix unused variable warning

From: Kirill A. Shutemov
Date: Mon Dec 26 2011 - 01:36:56 EST


On Mon, Dec 26, 2011 at 03:25:31PM +0900, KAMEZAWA Hiroyuki wrote:
> On Sat, 24 Dec 2011 05:00:14 +0200
> "Kirill A. Shutemov" <kirill@xxxxxxxxxxxxx> wrote:
>
> > From: "Kirill A. Shutemov" <kirill@xxxxxxxxxxxxx>
> >
> > mm/memcontrol.c: In function âmemcg_check_eventsâ:
> > mm/memcontrol.c:784:22: warning: unused variable âdo_numainfoâ [-Wunused-variable]
> >
> > Signed-off-by: Kirill A. Shutemov <kirill@xxxxxxxxxxxxx>
>
> Hmm ? Doesn't this fix cause a new Warning ?
>
> mm/memcontrol.c: In function ?memcg_check_events?:
> mm/memcontrol.c:789: warning: ISO C90 forbids mixed declarations and code

I don't see how. The result code is:

if (unlikely(mem_cgroup_event_ratelimit(memcg,
MEM_CGROUP_TARGET_THRESH))) {
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);


>
> Thanks,
> -Kame
> > ---
> > mm/memcontrol.c | 7 ++++---
> > 1 files changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> > index d643bd6..a5e92bd 100644
> > --- a/mm/memcontrol.c
> > +++ b/mm/memcontrol.c
> > @@ -781,14 +781,15 @@ 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;
> >
> > - do_softlimit = mem_cgroup_event_ratelimit(memcg,
> > - MEM_CGROUP_TARGET_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.7.3
> >
>

--
Kirill A. Shutemov
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/