Commit b281ebb8 authored by Jens Axboe's avatar Jens Axboe

Merge branch 'for-4.2/core' into for-4.2/drivers

parents 36a7e993 3f21c265
...@@ -1024,6 +1024,7 @@ bool __must_check blk_get_queue(struct request_queue *); ...@@ -1024,6 +1024,7 @@ bool __must_check blk_get_queue(struct request_queue *);
struct request_queue *blk_alloc_queue(gfp_t); struct request_queue *blk_alloc_queue(gfp_t);
struct request_queue *blk_alloc_queue_node(gfp_t, int); struct request_queue *blk_alloc_queue_node(gfp_t, int);
extern void blk_put_queue(struct request_queue *); extern void blk_put_queue(struct request_queue *);
extern void blk_set_queue_dying(struct request_queue *);
/* /*
* block layer runtime pm functions * block layer runtime pm functions
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment