diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-16 19:05:14 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-16 19:05:14 +0100 |
| commit | b0d78ee89c4ac1e99dda52f304baf82bd2a6c946 (patch) | |
| tree | 2aa8b6869b6daaefa1e7914849098337ce7f6283 /include | |
| parent | Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ko... (diff) | |
| parent | block: don't kick empty queue in blk_drain_queue() (diff) | |
| download | linux-b0d78ee89c4ac1e99dda52f304baf82bd2a6c946.tar.xz linux-b0d78ee89c4ac1e99dda52f304baf82bd2a6c946.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
* 'for-linus' of git://git.kernel.dk/linux-block:
block: don't kick empty queue in blk_drain_queue()
block/swim3: Locking fixes
loop: Fix discard_alignment default setting
cfq-iosched: fix cfq_cic_link() race confition
cfq-iosched: free cic_index if blkio_alloc_blkg_stats fails
cciss: fix flush cache transfer length
cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler
loop: fix loop block driver discard and encryption comment
block: initialize request_queue's numa node during
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index c7a6d3b5bc7b..94acd8172b5b 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -805,9 +805,6 @@ extern void blk_unprep_request(struct request *); */ extern struct request_queue *blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id); -extern struct request_queue *blk_init_allocated_queue_node(struct request_queue *, - request_fn_proc *, - spinlock_t *, int node_id); extern struct request_queue *blk_init_queue(request_fn_proc *, spinlock_t *); extern struct request_queue *blk_init_allocated_queue(struct request_queue *, request_fn_proc *, spinlock_t *); |