Conflicts: include/linux/blkdev.h Trivial merge to incorporate tag prototypes.
Showing the changes to include/linux/blkdev.h (1 of 628 files). Show all
Unified · Split
| @@ -748,6 +748,7 @@ extern void blk_queue_invalidate_tags(request_queue_t *); · 747 unmodified lines | ||
| 748 | 748 | extern long blk_congestion_wait(int rw, long timeout); |
| 749 | 749 | extern struct blk_queue_tag *blk_init_tags(int); |
| 750 | 750 | extern void blk_free_tags(struct blk_queue_tag *); |
| 751 | +extern void blk_congestion_end(int rw); | |
| 751 | 752 | |
| 752 | 753 | extern void blk_rq_bio_prep(request_queue_t *, struct request *, struct bio *); |
| 753 | 754 | extern int blkdev_issue_flush(struct block_device *, sector_t *); |