diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2009-10-13 06:29:45 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-13 06:29:45 -0400 |
commit | c30f33437c3f85ec48353a1ef811e148217a2aaf (patch) | |
tree | d5a0ca1e8d091a30fece2e9aeed285225c026049 /kernel/sched.c | |
parent | 132cc538cd90f60a0b5df6a512dfd4bc5fe2039a (diff) | |
parent | 2ec24ff1d1875defa742c76c9c7d74dca06b7e1f (diff) |
Merge branch 'for-linus' into for-2.6.33
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 1535f3884b88..074f753f7449 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -6720,9 +6720,6 @@ EXPORT_SYMBOL(yield); | |||
6720 | /* | 6720 | /* |
6721 | * This task is about to go to sleep on IO. Increment rq->nr_iowait so | 6721 | * This task is about to go to sleep on IO. Increment rq->nr_iowait so |
6722 | * that process accounting knows that this is a task in IO wait state. | 6722 | * that process accounting knows that this is a task in IO wait state. |
6723 | * | ||
6724 | * But don't do that if it is a deliberate, throttling IO wait (this task | ||
6725 | * has set its backing_dev_info: the queue against which it should throttle) | ||
6726 | */ | 6723 | */ |
6727 | void __sched io_schedule(void) | 6724 | void __sched io_schedule(void) |
6728 | { | 6725 | { |