2007-10-29 20:39:49

by Ingo Molnar

[permalink] [raw]
Subject: [git pull] scheduler fixes


Linus, please pull the latest scheduler git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched.git

it contains 7 commits: 3 (small) fixes, 1 code cleanup and 3 style
cleanups - all fallout of recent merges.

[ There is one commit that is borderline for post-rc1 inclusion: "sched:
report CPU usage in CFS cgroup directories" which completes/fixes
cgroup CPU accounting by introducing a small piece of new code. It's
only relevant to cgroups which is a new feature in 2.6.24 so there are
no regression/compatibility worries, so i included it. ]

Thanks,

Ingo

------------------>
Adrian Bunk (1):
sched: make kernel/sched.c:account_guest_time() static

Ingo Molnar (2):
sched: fix style of swap() macro in kernel/sched_fair.c
sched: fix style in kernel/sched.c

James Bottomley (1):
sched: fix incorrect assumption that cpu 0 exists

Paul Menage (1):
sched: report CPU usage in CFS cgroup directories

Peter Zijlstra (1):
sched: keep utime/stime monotonic

Srivatsa Vaddagiri (1):
sched: move rcu_head to task_group struct

fs/proc/array.c | 3 +-
include/linux/sched.h | 1
kernel/fork.c | 1
kernel/sched.c | 70 +++++++++++++++++++++++++++++++++++---------------
kernel/sched_fair.c | 2 -
5 files changed, 54 insertions(+), 23 deletions(-)


2007-10-29 23:34:32

by Ingo Molnar

[permalink] [raw]
Subject: [git pull] scheduler fix


Linus, this is a followup git pull request for a single fix:

git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched.git

Frans Pop has tested a fix from Balbir Singh that (finally) resolves the
procps CPU accounting bug. The fix you pulled earlier today was correct
but it solved only half of the problem.

Ingo

------------------>
Balbir Singh (1):
sched: fix /proc/<PID>/stat stime/utime monotonicity, part 2

fs/proc/array.c | 3 ++-
include/linux/sched.h | 2 +-
kernel/fork.c | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)

2007-10-30 10:16:18

by Guillaume Chazarain

[permalink] [raw]
Subject: Re: [git pull] scheduler fix

2007/10/30, Ingo Molnar <[email protected]>:
> fs/proc/array.c | 3 ++-
> include/linux/sched.h | 2 +-
> kernel/fork.c | 1 +
> 3 files changed, 4 insertions(+), 2 deletions(-)

Hello Ingo,

do you think it would be possible to include the patch in your git
pull request emails? Especially when the patch is small like this one.

Jeff showed a suitable script in
http://www.uwsg.iu.edu/hypermail/linux/kernel/0710.1/2218.html

Thanks.

--
Guillaume

2007-11-01 08:40:20

by Ingo Molnar

[permalink] [raw]
Subject: Re: [git pull] scheduler fix


* Guillaume Chazarain <[email protected]> wrote:

> 2007/10/30, Ingo Molnar <[email protected]>:
> > fs/proc/array.c | 3 ++-
> > include/linux/sched.h | 2 +-
> > kernel/fork.c | 1 +
> > 3 files changed, 4 insertions(+), 2 deletions(-)
>
> Hello Ingo,
>
> do you think it would be possible to include the patch in your git
> pull request emails? Especially when the patch is small like this one.

yeah, will do that in the future.

Ingo