diff options
| author | Jens Axboe <axboe@fb.com> | 2015-06-05 12:58:28 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-06-05 12:58:28 -0400 |
| commit | b281ebb817b009dc586347d7800b80944ba3ec18 (patch) | |
| tree | 2d852a75be67ead7e575d08347198c61d738191d | |
| parent | 36a7e993eedb2c3f11de3b686b351f75e1edbbb5 (diff) | |
| parent | 3f21c265cd5f7ae867cc0e86a1f6d5093f1963cc (diff) | |
Merge branch 'for-4.2/core' into for-4.2/drivers
| -rw-r--r-- | include/linux/blkdev.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index ccaa9aecd593..a31380c35918 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -1024,6 +1024,7 @@ bool __must_check blk_get_queue(struct request_queue *); | |||
| 1024 | struct request_queue *blk_alloc_queue(gfp_t); | 1024 | struct request_queue *blk_alloc_queue(gfp_t); |
| 1025 | struct request_queue *blk_alloc_queue_node(gfp_t, int); | 1025 | struct request_queue *blk_alloc_queue_node(gfp_t, int); |
| 1026 | extern void blk_put_queue(struct request_queue *); | 1026 | extern void blk_put_queue(struct request_queue *); |
| 1027 | extern void blk_set_queue_dying(struct request_queue *); | ||
| 1027 | 1028 | ||
| 1028 | /* | 1029 | /* |
| 1029 | * block layer runtime pm functions | 1030 | * block layer runtime pm functions |