From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: Re: [PATCH -mm] Hook up group scheduler with control groups Date: Thu, 27 Sep 2007 16:42:41 -0700 Message-ID: <20070927164241.ca034043.akpm@linux-foundation.org> References: <20070927150624.GG4415@linux.vnet.ibm.com> <20070927104005.2ed0b81d.randy.dunlap@oracle.com> <20070927180415.GC5715@linux.vnet.ibm.com> <20070927120033.45915a61.randy.dunlap@oracle.com> <20070927193512.GD5715@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20070927193512.GD5715@linux.vnet.ibm.com> Sender: linux-kernel-owner@vger.kernel.org To: Dhaval Giani Cc: randy.dunlap@oracle.com, vatsa@linux.vnet.ibm.com, mingo@elte.hu, dmitry.adamushko@gmail.com, efault@gmx.de, linux-kernel@vger.kernel.org, containers@lists.osdl.org List-Id: containers.vger.kernel.org On Fri, 28 Sep 2007 01:05:12 +0530 Dhaval Giani wrote: > On Thu, Sep 27, 2007 at 12:00:33PM -0700, Randy Dunlap wrote: > > On Thu, 27 Sep 2007 23:34:15 +0530 Dhaval Giani wrote: > > > > > > > > > +config RESOURCE_COUNTERS > > > + bool "Resource counters" > > > + help > > > + This option enables controller independent resource accounting > > > > Above line is tab + 2 spaces (i.e., correct). > > > > > + infrastructure that works with cgroups. > > > > Above line indent is 10 spaces (i.e., not correct). > > > > Ah! Thanks for the explanation. Corrected patch follows. > > Signed-off-by : Srivatsa Vaddagiri > Signed-off-by : Dhaval Giani > > ... > > @@ -219,6 +225,9 @@ static inline struct task_grp *task_grp( > > #ifdef CONFIG_FAIR_USER_SCHED > tg = p->user->tg; > +#elif CONFIG_FAIR_CGROUP_SCHED > + tg = container_of(task_subsys_state(p, cpu_cgroup_subsys_id), > + struct task_grp, css); > #else > tg = &init_task_grp; > #endif that's a bit funny-looking. Are CONFIG_FAIR_CGROUP_SCHED and CONFIG_FAIR_USER_SCHED mutually exclusive? Doesn't seem that way. if they're both defined then CONFIG_FAIR_USER_SCHED "wins". Anyway, please confirm that this is correct? I'll switch that to `#elif defined(CONFIG_FAIR_CGROUP_SCHED)'. We can get gcc warnings with `#if CONFIG_FOO', and people should be using `#ifdef CONFIG_FOO', so I assume the same applies to #elif.