diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-06-19 09:26:21 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-06-27 20:13:45 +0200 |
| commit | 3bce016a4c5975e4279bfb3cbd6d0332b856cc72 (patch) | |
| tree | f62aa84586ecb52b201c69bc53db649e2919a559 /block | |
| parent | blk-map: call blk_queue_bounce from blk_rq_append_bio (diff) | |
| download | linux-3bce016a4c5975e4279bfb3cbd6d0332b856cc72.tar.xz linux-3bce016a4c5975e4279bfb3cbd6d0332b856cc72.zip | |
block: move bounce declarations to block/blk.h
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk.h | 13 | ||||
| -rw-r--r-- | block/bounce.c | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/block/blk.h b/block/blk.h index 798691a5e5e9..01ebb8185f6b 100644 --- a/block/blk.h +++ b/block/blk.h @@ -336,4 +336,17 @@ static inline void blk_throtl_bio_endio(struct bio *bio) { } static inline void blk_throtl_stat_add(struct request *rq, u64 time) { } #endif +#ifdef CONFIG_BOUNCE +extern int init_emergency_isa_pool(void); +extern void blk_queue_bounce(struct request_queue *q, struct bio **bio); +#else +static inline int init_emergency_isa_pool(void) +{ + return 0; +} +static inline void blk_queue_bounce(struct request_queue *q, struct bio **bio) +{ +} +#endif /* CONFIG_BOUNCE */ + #endif /* BLK_INTERNAL_H */ diff --git a/block/bounce.c b/block/bounce.c index 27c5cc0f1ed5..36ba44491703 100644 --- a/block/bounce.c +++ b/block/bounce.c @@ -22,6 +22,7 @@ #include <asm/tlbflush.h> #include <trace/events/block.h> +#include "blk.h" #define POOL_SIZE 64 #define ISA_POOL_SIZE 16 |