[patch] sched: trivial fix for incorrect comments

[patch] sched: trivial fix for incorrect comments

[Chris Friesen]

From: Chris Friesen    <cfriesen@nortel.com>

A couple of the comments for the conditional definitions in sched.c are
incorrect.  Here's a trivial patch fixing them up.


Signed-off-by: Chris Friesen <cfriesen@nortel.com>
Approval token "Nortel-02-July-2008-01"

---

diff --git a/kernel/sched.c b/kernel/sched.c
index cc1f81b..8ddca50 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -298,9 +298,9 @@ static DEFINE_PER_CPU(struct cfs_rq, init_cfs_rq) 
____cacheline_aligned_in_smp;
  static DEFINE_PER_CPU(struct sched_rt_entity, init_sched_rt_entity);
  static DEFINE_PER_CPU(struct rt_rq, init_rt_rq) 
____cacheline_aligned_in_smp;
  #endif /* CONFIG_RT_GROUP_SCHED */
-#else /* !CONFIG_FAIR_GROUP_SCHED */
+#else /* !CONFIG_USER_SCHED */
  #define root_task_group init_task_group
-#endif /* CONFIG_FAIR_GROUP_SCHED */
+#endif /* CONFIG_USER_SCHED */

  /* task_group_lock serializes add/remove of task groups and also 
changes to
   * a task group's cpu shares.

Re: [patch] sched: trivial fix for incorrect comments

[Ingo Molnar]

* Chris Friesen <cfriesen@nortel.com> wrote:

> From: Chris Friesen    <cfriesen@nortel.com>
>
> A couple of the comments for the conditional definitions in sched.c are
> incorrect.  Here's a trivial patch fixing them up.

looks good to me, but the patch is whitespace corrupted. Please see 
Documentation/email-clients.txt about how to send plain-text patches.

	Ingo

Re: [patch] sched: trivial fix for incorrect comments

[Chris Friesen]

Ingo Molnar wrote:
> * Chris Friesen <cfriesen@nortel.com> wrote:
> 
>> From: Chris Friesen    <cfriesen@nortel.com>
>>
>> A couple of the comments for the conditional definitions in sched.c are
>> incorrect.  Here's a trivial patch fixing them up.
> 
> looks good to me, but the patch is whitespace corrupted. Please see 
> Documentation/email-clients.txt about how to send plain-text patches.
> 
> 	Ingo
> 

Actually, I thought I was following the procedures in there.  It turns out 
that older Thunderbird requires an external editor, disabling 
format=flowed, and a line wrap of 0.  The email clients doc makes it sound
like if you use an external editor you don't need the other parts.  With
current Thunderbird the external editor is still not sufficient by itself,
but isn't required if the other two items are configured properly.

Here's another try.

---
From: Chris Friesen <cfriesen@nortel.com>
Subject: [PATCH] sched: trivial fix for incorrect comments

A couple of the comments for the conditional definitions in sched.c are
incorrect.  Here's a trivial patch fixing them up.

Signed-off-by: Chris Friesen <cfriesen@nortel.com>
Approval token "Nortel-02-July-2008-01"
---
 kernel/sched.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/sched.c b/kernel/sched.c
index cc1f81b..8ddca50 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -298,9 +298,9 @@ static DEFINE_PER_CPU(struct cfs_rq, init_cfs_rq) ____cacheline_aligned_in_smp;
 static DEFINE_PER_CPU(struct sched_rt_entity, init_sched_rt_entity);
 static DEFINE_PER_CPU(struct rt_rq, init_rt_rq) ____cacheline_aligned_in_smp;
 #endif /* CONFIG_RT_GROUP_SCHED */
-#else /* !CONFIG_FAIR_GROUP_SCHED */
+#else /* !CONFIG_USER_SCHED */
 #define root_task_group init_task_group
-#endif /* CONFIG_FAIR_GROUP_SCHED */
+#endif /* CONFIG_USER_SCHED */
 
 /* task_group_lock serializes add/remove of task groups and also changes to
  * a task group's cpu shares.

Re: [patch] sched: trivial fix for incorrect comments

[Ingo Molnar]

* Chris Friesen <cfriesen@nortel.com> wrote:

> --- a/kernel/sched.c
> +++ b/kernel/sched.c
> @@ -298,9 +298,9 @@ static DEFINE_PER_CPU(struct cfs_rq, init_cfs_rq) ____cacheline_aligned_in_smp;
> static DEFINE_PER_CPU(struct sched_rt_entity, init_sched_rt_entity);
> static DEFINE_PER_CPU(struct rt_rq, init_rt_rq) ____cacheline_aligned_in_smp;
> #endif /* CONFIG_RT_GROUP_SCHED */
> -#else /* !CONFIG_FAIR_GROUP_SCHED */
> +#else /* !CONFIG_USER_SCHED */
> #define root_task_group init_task_group
> -#endif /* CONFIG_FAIR_GROUP_SCHED */
> +#endif /* CONFIG_USER_SCHED */

hm, these seem to be fixed already, via:

| commit 9a7e0b180da21885988d47558671cf580279f9d6
| Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
| Date:   Tue Aug 19 12:33:06 2008 +0200
|
|     sched: rt-bandwidth fixes

is all in tip/master.

(or is perhaps the direction of your patch wrong?)

	Ingo

Re: [patch] sched: trivial fix for incorrect comments

[Peter Zijlstra]

On Sat, 2008-09-27 at 20:10 +0200, Ingo Molnar wrote:
> * Chris Friesen <cfriesen@nortel.com> wrote:
> 
> > --- a/kernel/sched.c
> > +++ b/kernel/sched.c
> > @@ -298,9 +298,9 @@ static DEFINE_PER_CPU(struct cfs_rq, init_cfs_rq) ____cacheline_aligned_in_smp;
> > static DEFINE_PER_CPU(struct sched_rt_entity, init_sched_rt_entity);
> > static DEFINE_PER_CPU(struct rt_rq, init_rt_rq) ____cacheline_aligned_in_smp;
> > #endif /* CONFIG_RT_GROUP_SCHED */
> > -#else /* !CONFIG_FAIR_GROUP_SCHED */
> > +#else /* !CONFIG_USER_SCHED */
> > #define root_task_group init_task_group
> > -#endif /* CONFIG_FAIR_GROUP_SCHED */
> > +#endif /* CONFIG_USER_SCHED */
> 
> hm, these seem to be fixed already, via:
> 
> | commit 9a7e0b180da21885988d47558671cf580279f9d6
> | Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
> | Date:   Tue Aug 19 12:33:06 2008 +0200
> |
> |     sched: rt-bandwidth fixes
> 
> is all in tip/master.
> 
> (or is perhaps the direction of your patch wrong?)

No I think he got it right, as I vaguely remember fixing it too - now I
know where I left it ;-)

I often leave such trivial comment fixes in whatever patch I'm working
on at that moment.

Re: [patch] sched: trivial fix for incorrect comments

[Ingo Molnar]

* Peter Zijlstra <a.p.zijlstra@chello.nl> wrote:

> On Sat, 2008-09-27 at 20:10 +0200, Ingo Molnar wrote:
> > * Chris Friesen <cfriesen@nortel.com> wrote:
> > 
> > > --- a/kernel/sched.c
> > > +++ b/kernel/sched.c
> > > @@ -298,9 +298,9 @@ static DEFINE_PER_CPU(struct cfs_rq, init_cfs_rq) ____cacheline_aligned_in_smp;
> > > static DEFINE_PER_CPU(struct sched_rt_entity, init_sched_rt_entity);
> > > static DEFINE_PER_CPU(struct rt_rq, init_rt_rq) ____cacheline_aligned_in_smp;
> > > #endif /* CONFIG_RT_GROUP_SCHED */
> > > -#else /* !CONFIG_FAIR_GROUP_SCHED */
> > > +#else /* !CONFIG_USER_SCHED */
> > > #define root_task_group init_task_group
> > > -#endif /* CONFIG_FAIR_GROUP_SCHED */
> > > +#endif /* CONFIG_USER_SCHED */
> > 
> > hm, these seem to be fixed already, via:
> > 
> > | commit 9a7e0b180da21885988d47558671cf580279f9d6
> > | Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
> > | Date:   Tue Aug 19 12:33:06 2008 +0200
> > |
> > |     sched: rt-bandwidth fixes
> > 
> > is all in tip/master.
> > 
> > (or is perhaps the direction of your patch wrong?)
> 
> No I think he got it right, as I vaguely remember fixing it too - now 
> I know where I left it ;-)
> 
> I often leave such trivial comment fixes in whatever patch I'm working 
> on at that moment.

that's OK. The risk is of course that if the other bits of this commit 
break something, and we drop or revert the commit, we drop the cleanup 
as well. But the patch was perfect in this case so all is fine :-)

	Ingo