diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-13 17:21:33 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-13 17:21:33 (GMT) |
| commit | 80f506918fdaaca6b574ba931536a58ce015c7be (patch) | |
| tree | 938bddf32e8c5dca114cb1a5f3ca2a62960accc8 /kernel | |
| parent | a3bafbbbb5ac49355aa35e6a722eac6ef1dff19a (diff) | |
| parent | 2ec24ff1d1875defa742c76c9c7d74dca06b7e1f (diff) | |
| download | linux-80f506918fdaaca6b574ba931536a58ce015c7be.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cciss: Add cciss_allow_hpsa module parameter
cciss: Fix multiple calls to pci_release_regions
blk-settings: fix function parameter kernel-doc notation
writeback: kill space in debugfs item name
writeback: account IO throttling wait as iowait
elv_iosched_store(): fix strstrip() misuse
cfq-iosched: avoid probable slice overrun when idling
cfq-iosched: apply bool value where we return 0/1
cfq-iosched: fix think time allowed for seekers
cfq-iosched: fix the slice residual sign
cfq-iosched: abstract out the 'may this cfqq dispatch' logic
block: use proper BLK_RW_ASYNC in blk_queue_start_tag()
block: Seperate read and write statistics of in_flight requests v2
block: get rid of kblock_schedule_delayed_work()
cfq-iosched: fix possible problem with jiffies wraparound
cfq-iosched: fix issue with rq-rq merging and fifo list ordering
Diffstat (limited to 'kernel')
| -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 76c0e96..8d25be0 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -6718,9 +6718,6 @@ EXPORT_SYMBOL(yield); /* * This task is about to go to sleep on IO. Increment rq->nr_iowait so * that process accounting knows that this is a task in IO wait state. - * - * But don't do that if it is a deliberate, throttling IO wait (this task - * has set its backing_dev_info: the queue against which it should throttle) */ void __sched io_schedule(void) { |