diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-02 09:52:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-02 09:52:58 -0700 |
| commit | 123f94f22e3d283dfe68742b269c245b0501ad82 (patch) | |
| tree | 1d40043b0909f309cf77204ea87be9e61f143e79 /kernel/sched.c | |
| parent | 4b78c119f0ba715b4e29b190bf4d7bce810ea0d6 (diff) | |
| parent | 8c215bd3890c347dfb6a2db4779755f8b9c298a9 (diff) | |
| download | op-kernel-dev-123f94f22e3d283dfe68742b269c245b0501ad82.zip op-kernel-dev-123f94f22e3d283dfe68742b269c245b0501ad82.tar.gz | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Cure nr_iowait_cpu() users
init: Fix comment
init, sched: Fix race between init and kthreadd
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index cb816e3..f52a880 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -2873,9 +2873,9 @@ unsigned long nr_iowait(void) return sum; } -unsigned long nr_iowait_cpu(void) +unsigned long nr_iowait_cpu(int cpu) { - struct rq *this = this_rq(); + struct rq *this = cpu_rq(cpu); return atomic_read(&this->nr_iowait); } |
