Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bce016a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: move bounce declarations to block/blk.h 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent caa4b024

block/blk.h

+13 −0
Original line number Diff line number Diff line
@@ -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 */

block/bounce.c

+1 −0
Original line number Diff line number Diff line
@@ -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

include/linux/blkdev.h

+0 −13
Original line number Diff line number Diff line
@@ -884,19 +884,6 @@ extern unsigned long blk_max_low_pfn, blk_max_pfn; 
#define BLK_DEFAULT_SG_TIMEOUT	(60 * HZ)

#define BLK_MIN_SG_TIMEOUT	(7 * HZ)



#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_MMU */



struct rq_map_data {

	struct page **pages;

	int page_order;