diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 21:26:44 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 21:26:44 +0200 |
| commit | b2e961eb2e7a54ffaae82f8e0198b26b54ade98e (patch) | |
| tree | 33e5192a4c84e717d8c2f8235f268216b01053f7 /mm | |
| parent | slab: correctly handle __GFP_ZERO (diff) | |
| parent | [BLOCK] Add request_queue_t and mark it deprecated (diff) | |
| download | linux-b2e961eb2e7a54ffaae82f8e0198b26b54ade98e.tar.xz linux-b2e961eb2e7a54ffaae82f8e0198b26b54ade98e.zip | |
Merge branch 'request-queue-t' of git://git.kernel.dk/linux-2.6-block
* 'request-queue-t' of git://git.kernel.dk/linux-2.6-block:
[BLOCK] Add request_queue_t and mark it deprecated
[BLOCK] Get rid of request_queue_t typedef
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/bounce.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/bounce.c b/mm/bounce.c index ad401fc57440..179fe38a2416 100644 --- a/mm/bounce.c +++ b/mm/bounce.c @@ -190,7 +190,7 @@ static int bounce_end_io_read_isa(struct bio *bio, unsigned int bytes_done, int return 0; } -static void __blk_queue_bounce(request_queue_t *q, struct bio **bio_orig, +static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig, mempool_t *pool) { struct page *page; @@ -275,7 +275,7 @@ static void __blk_queue_bounce(request_queue_t *q, struct bio **bio_orig, *bio_orig = bio; } -void blk_queue_bounce(request_queue_t *q, struct bio **bio_orig) +void blk_queue_bounce(struct request_queue *q, struct bio **bio_orig) { mempool_t *pool; |