summaryrefslogtreecommitdiff
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-06-17 20:47:38 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-06-17 20:47:38 -0700
commit3986594c6167a269053d3d88f17e53e0ca4023f8 (patch)
tree316dc9079f5be1fab7edb4c53fdc0182bb457e7a /include/linux/blkdev.h
parent5567614b40b53cf9abe6e8370f40d19a9206f2ed (diff)
parent73769d9baca2040c407de7230377d440b9d11997 (diff)
Merge master.kernel.org:/home/mingo/bk-misc
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r--include/linux/blkdev.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index ef86a3ed6e64..c0c099834df2 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -246,12 +246,7 @@ extern unsigned long blk_max_low_pfn, blk_max_pfn;
#define BLK_BOUNCE_ISA (ISA_DMA_THRESHOLD)
extern int init_emergency_isa_pool(void);
-extern void create_bounce(unsigned long pfn, int gfp, struct bio **bio_orig);
-
-extern inline void blk_queue_bounce(request_queue_t *q, struct bio **bio)
-{
- create_bounce(q->bounce_pfn, q->bounce_gfp, bio);
-}
+void blk_queue_bounce(request_queue_t *q, struct bio **bio);
#define rq_for_each_bio(bio, rq) \
if ((rq->bio)) \