From: Michal Hocko <mhocko@suse.cz>
To: Glauber Costa <glommer@parallels.com>
Cc: Sachin Kamat <sachin.kamat@linaro.org>,
cgroups@vger.kernel.org, linux-mm@kvack.org,
Johannes Weiner <hannes@cmpxchg.org>,
Balbir Singh <bsingharora@gmail.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [PATCH] mm/memcontrol.c: Remove duplicate inclusion of sock.h file
Date: Wed, 12 Sep 2012 14:56:47 +0200 [thread overview]
Message-ID: <20120912125647.GH21579@dhcp22.suse.cz> (raw)
In-Reply-To: <50504CE1.8030509@parallels.com>
On Wed 12-09-12 12:50:41, Glauber Costa wrote:
[...]
> >> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> >> index 795e525..85ec9ff 100644
> >> --- a/mm/memcontrol.c
> >> +++ b/mm/memcontrol.c
> >> @@ -50,8 +50,12 @@
> >> #include <linux/cpu.h>
> >> #include <linux/oom.h>
> >> #include "internal.h"
> >> +
> >> +#ifdef CONFIG_MEMCG_KMEM
> >> #include <net/sock.h>
> >> +#include <net/ip.h>
> >> #include <net/tcp_memcontrol.h>
> >> +#endif
> >>
> >> #include <asm/uaccess.h>
> >>
> >> @@ -326,7 +330,7 @@ struct mem_cgroup {
> >> struct mem_cgroup_stat_cpu nocpu_base;
> >> spinlock_t pcp_counter_lock;
> >>
> >> -#ifdef CONFIG_INET
> >> +#ifdef CONFIG_MEMCG_KMEM
> >> struct tcp_memcontrol tcp_mem;
> >> #endif
> >> };
>
> If you are changing this, why not test for both? This field will be
> useless with inet disabled. I usually don't like conditional in
> structures (note that the "kmem" res counter in my patchsets is not
> conditional to KMEM!!), but since the decision was made to make this one
> conditional, I think INET is a much better test. I am fine with both though.
You are right of course. Updated patch bellow:
---
next prev parent reply other threads:[~2012-09-12 12:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-11 8:08 [PATCH] mm/memcontrol.c: Remove duplicate inclusion of sock.h file Sachin Kamat
2012-09-11 9:52 ` Michal Hocko
2012-09-12 3:39 ` Sachin Kamat
2012-09-12 7:25 ` Michal Hocko
2012-09-12 8:50 ` Glauber Costa
2012-09-12 12:56 ` Michal Hocko [this message]
2012-09-12 13:09 ` Michal Hocko
2012-09-14 7:58 ` Sachin Kamat
2012-09-14 8:27 ` Michal Hocko
2012-09-14 8:32 ` Glauber Costa
2012-09-14 9:56 ` Michal Hocko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120912125647.GH21579@dhcp22.suse.cz \
--to=mhocko@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=bsingharora@gmail.com \
--cc=cgroups@vger.kernel.org \
--cc=glommer@parallels.com \
--cc=hannes@cmpxchg.org \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-mm@kvack.org \
--cc=sachin.kamat@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).