diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sched/core.c | 7 | ||||
-rw-r--r-- | kernel/sched/proc.c | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 3bdf01b494fe..863ef1d19563 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
@@ -2385,6 +2385,13 @@ unsigned long nr_iowait_cpu(int cpu) | |||
2385 | return atomic_read(&this->nr_iowait); | 2385 | return atomic_read(&this->nr_iowait); |
2386 | } | 2386 | } |
2387 | 2387 | ||
2388 | void get_iowait_load(unsigned long *nr_waiters, unsigned long *load) | ||
2389 | { | ||
2390 | struct rq *this = this_rq(); | ||
2391 | *nr_waiters = atomic_read(&this->nr_iowait); | ||
2392 | *load = this->cpu_load[0]; | ||
2393 | } | ||
2394 | |||
2388 | #ifdef CONFIG_SMP | 2395 | #ifdef CONFIG_SMP |
2389 | 2396 | ||
2390 | /* | 2397 | /* |
diff --git a/kernel/sched/proc.c b/kernel/sched/proc.c index 16f5a30f9c88..8ecd552fe4f2 100644 --- a/kernel/sched/proc.c +++ b/kernel/sched/proc.c | |||
@@ -8,13 +8,6 @@ | |||
8 | 8 | ||
9 | #include "sched.h" | 9 | #include "sched.h" |
10 | 10 | ||
11 | unsigned long this_cpu_load(void) | ||
12 | { | ||
13 | struct rq *this = this_rq(); | ||
14 | return this->cpu_load[0]; | ||
15 | } | ||
16 | |||
17 | |||
18 | /* | 11 | /* |
19 | * Global load-average calculations | 12 | * Global load-average calculations |
20 | * | 13 | * |