Skip to contentSkip to conversation

sched: trivial fix for incorrect comments

PATCH In review Chris Friesen 3 participants 6 messages Sep 19, 2008 – Sep 27, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sched: trivial fix for incorrect comments

From: Chris Friesen <[email protected]>

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

Approval token "Nortel-02-July-2008-01"

---

kernel/sched.c +0 -0
index cc1f81b..8ddca50 100644
@@ -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.

#1 lore raw
Quoted 4 lines · Chris Friesen

From: Chris Friesen <[email protected]>

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

#2 lore raw
Quoted 11 lines · Ingo Molnar
Quoted 4 lines · Chris Friesen

From: Chris Friesen <[email protected]>

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 <[email protected]>
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.

Approval token "Nortel-02-July-2008-01"
---
kernel/sched.c | 4 ++--

1 files changed, 2 insertions(+), 2 deletions(-)
kernel/sched.c +0 -0
index cc1f81b..8ddca50 100644
@@ -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.

#3 lore raw

kernel/sched.c static DEFINE_PER_CPU(struct cfs_rq, init_cfs_rq) ____cacheline_aligned_in_smp; · line 303

Quoted 11 lines · Chris Friesen
kernel/sched.c +2 -2
@@ -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 <[email protected]>
| 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

#4 lore raw
Quoted 22 lines · Ingo Molnar

kernel/sched.c static DEFINE_PER_CPU(struct cfs_rq, init_cfs_rq) ____cacheline_aligned_in_smp; · line 303

Quoted 11 lines · Chris Friesen
kernel/sched.c +2 -2
@@ -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 <[email protected]>
| Date:   Tue Aug 19 12:33:06 2008 +0200
|
|     sched: rt-bandwidth fixes
Quoted 3 lines

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.

#5 lore raw
Quoted 25 lines · Peter Zijlstra
Quoted 24 lines · Ingo Molnar

kernel/sched.c static DEFINE_PER_CPU(struct cfs_rq, init_cfs_rq) ____cacheline_aligned_in_smp; · line 303

Quoted 11 lines · Chris Friesen
kernel/sched.c +2 -2
@@ -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 <[email protected]>
| Date:   Tue Aug 19 12:33:06 2008 +0200
|
|     sched: rt-bandwidth fixes

is all in tip/master.

Quoted 7 lines
Quoted 1 line

(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