diff options
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index e9a0b61f12ab..9d42cbfc4f8b 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -51,6 +51,7 @@ | |||
51 | #include <linux/times.h> | 51 | #include <linux/times.h> |
52 | #include <linux/acct.h> | 52 | #include <linux/acct.h> |
53 | #include <linux/kprobes.h> | 53 | #include <linux/kprobes.h> |
54 | #include <linux/delayacct.h> | ||
54 | #include <asm/tlb.h> | 55 | #include <asm/tlb.h> |
55 | 56 | ||
56 | #include <asm/unistd.h> | 57 | #include <asm/unistd.h> |
@@ -4534,9 +4535,11 @@ void __sched io_schedule(void) | |||
4534 | { | 4535 | { |
4535 | struct rq *rq = &__raw_get_cpu_var(runqueues); | 4536 | struct rq *rq = &__raw_get_cpu_var(runqueues); |
4536 | 4537 | ||
4538 | delayacct_blkio_start(); | ||
4537 | atomic_inc(&rq->nr_iowait); | 4539 | atomic_inc(&rq->nr_iowait); |
4538 | schedule(); | 4540 | schedule(); |
4539 | atomic_dec(&rq->nr_iowait); | 4541 | atomic_dec(&rq->nr_iowait); |
4542 | delayacct_blkio_end(); | ||
4540 | } | 4543 | } |
4541 | EXPORT_SYMBOL(io_schedule); | 4544 | EXPORT_SYMBOL(io_schedule); |
4542 | 4545 | ||
@@ -4545,9 +4548,11 @@ long __sched io_schedule_timeout(long timeout) | |||
4545 | struct rq *rq = &__raw_get_cpu_var(runqueues); | 4548 | struct rq *rq = &__raw_get_cpu_var(runqueues); |
4546 | long ret; | 4549 | long ret; |
4547 | 4550 | ||
4551 | delayacct_blkio_start(); | ||
4548 | atomic_inc(&rq->nr_iowait); | 4552 | atomic_inc(&rq->nr_iowait); |
4549 | ret = schedule_timeout(timeout); | 4553 | ret = schedule_timeout(timeout); |
4550 | atomic_dec(&rq->nr_iowait); | 4554 | atomic_dec(&rq->nr_iowait); |
4555 | delayacct_blkio_end(); | ||
4551 | return ret; | 4556 | return ret; |
4552 | } | 4557 | } |
4553 | 4558 | ||