diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2022-03-02 11:28:33 -0500 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2022-03-02 11:28:33 -0500 |
| commit | 230bc2bed518632602bd2cdad6ba5d2081d448b5 (patch) | |
| tree | f08bf885fe7d2a81939d74e3051a8cc8185c4915 /include/linux/blkdev.h | |
| parent | 17003d109e6cd08d4db5f6525a1023537ce6c743 (diff) | |
| parent | 38a15ad9488e21cad8f42d3befca20f91e5b2874 (diff) | |
Merge drm/drm-next into drm-intel-next
To catch up with recent rounds of pull requests
and get some drm-misc dependencies so we can merge
linux/string_helpers related changes.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index f35aea98bc35..16b47035e4b0 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -748,7 +748,8 @@ extern bool blk_queue_can_use_dma_map_merging(struct request_queue *q, bool __must_check blk_get_queue(struct request_queue *); extern void blk_put_queue(struct request_queue *); -extern void blk_set_queue_dying(struct request_queue *); + +void blk_mark_disk_dead(struct gendisk *disk); #ifdef CONFIG_BLOCK /* |