History

Merge mulgrave-w:git/linux-2.6

Conflicts: include/linux/blkdev.h Trivial merge to incorporate tag prototypes.

James Bottomley committed 20 years ago

Commit 1aedf2c2 parents dfdc58b 1ab9dd0628 files · +33028 −15465Browse files

Showing the changes to include/linux/blkdev.h (1 of 628 files). Show all

Unified · Split

include/linux/blkdev.h+1−0
@@ -748,6 +748,7 @@ extern void blk_queue_invalidate_tags(request_queue_t *); · 747 unmodified lines
748extern long blk_congestion_wait(int rw, long timeout);748extern long blk_congestion_wait(int rw, long timeout);
749extern struct blk_queue_tag *blk_init_tags(int);749extern struct blk_queue_tag *blk_init_tags(int);
750extern void blk_free_tags(struct blk_queue_tag *);750extern void blk_free_tags(struct blk_queue_tag *);
751extern void blk_congestion_end(int rw);
751 752
752extern void blk_rq_bio_prep(request_queue_t *, struct request *, struct bio *);753extern void blk_rq_bio_prep(request_queue_t *, struct request *, struct bio *);
753extern int blkdev_issue_flush(struct block_device *, sector_t *);754extern int blkdev_issue_flush(struct block_device *, sector_t *);