diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 18:29:55 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 18:29:55 +0200 |
| commit | c53dbf54863e7f3b0b8810dda2bdd0290006bdac (patch) | |
| tree | f783074f1bec1112bf1148a077e0114a38403ad4 /block/blk-settings.c | |
| parent | Merge branch 'for-linus' of git://www.jni.nu/cris (diff) | |
| parent | block: remove __generic_unplug_device() from exports (diff) | |
| download | linux-c53dbf54863e7f3b0b8810dda2bdd0290006bdac.tar.xz linux-c53dbf54863e7f3b0b8810dda2bdd0290006bdac.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: remove __generic_unplug_device() from exports
block: move q->unplug_work initialization
blktrace: pass zfcp driver data
blktrace: add support for driver data
block: fix current kernel-doc warnings
block: only call ->request_fn when the queue is not stopped
block: simplify string handling in elv_iosched_store()
block: fix kernel-doc for blk_alloc_devt()
block: fix nr_phys_segments miscalculation bug
block: add partition attribute for partition number
block: add BIG FAT WARNING to CONFIG_DEBUG_BLOCK_EXT_DEVT
softirq: Add support for triggering softirq work on softirqs.
Diffstat (limited to 'block/blk-settings.c')
| -rw-r--r-- | block/blk-settings.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c index b21dcdb64151..41392fbe19ff 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -141,8 +141,6 @@ void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn) if (q->unplug_delay == 0) q->unplug_delay = 1; - INIT_WORK(&q->unplug_work, blk_unplug_work); - q->unplug_timer.function = blk_unplug_timeout; q->unplug_timer.data = (unsigned long)q; |