diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-09-08 08:11:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-09-08 08:11:34 +0200 |
| commit | e2627dce268024aff962132057cb8acb219c9c40 (patch) | |
| tree | 52711c41cf957b0fa37d08e627c6370c7aa637fa /kernel/sched/core.c | |
| parent | 177ef2a6315ea7bf173653182324e1dcd08ffeaa (diff) | |
| parent | 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd (diff) | |
| download | linux-e2627dce268024aff962132057cb8acb219c9c40.tar.bz2 | |
Merge tag 'v3.17-rc4' into sched/core, to prevent conflicts with upcoming patches, and to refresh the tree
Linux 3.17-rc4
Diffstat (limited to 'kernel/sched/core.c')
| -rw-r--r-- | kernel/sched/core.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 8d00f4a8c126..a814b3c88029 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2407,6 +2407,13 @@ unsigned long nr_iowait_cpu(int cpu) return atomic_read(&this->nr_iowait); } +void get_iowait_load(unsigned long *nr_waiters, unsigned long *load) +{ + struct rq *this = this_rq(); + *nr_waiters = atomic_read(&this->nr_iowait); + *load = this->cpu_load[0]; +} + #ifdef CONFIG_SMP /* |