diff options
author | Jani Nikula <jani.nikula@intel.com> | 2018-05-02 12:20:32 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2018-05-02 12:20:32 +0300 |
commit | 53f071e19d566e7d0a4eada1bd8313a4cdb660a4 (patch) | |
tree | ee2aecae90ec29ab404cf60bedeb3feb2ec99966 /drivers/nvdimm/blk.c | |
parent | 043477b088d2af61a0937754c6560002237e6741 (diff) | |
parent | 0ab390262c4920f26f8202063a268d5fc829728e (diff) | |
download | linux-53f071e19d566e7d0a4eada1bd8313a4cdb660a4.tar.xz |
Merge drm/drm-next into drm-intel-next-queued
Need d224985a5e31 ("sched/wait, drivers/drm: Convert wait_on_atomic_t()
usage to the new wait_var_event() API") in dinq to be able to fix
https://bugs.freedesktop.org/show_bug.cgi?id=106085.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/nvdimm/blk.c')
-rw-r--r-- | drivers/nvdimm/blk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/blk.c b/drivers/nvdimm/blk.c index 1bd7b3734751..62e9cb167aad 100644 --- a/drivers/nvdimm/blk.c +++ b/drivers/nvdimm/blk.c @@ -266,7 +266,7 @@ static int nsblk_attach_disk(struct nd_namespace_blk *nsblk) blk_queue_make_request(q, nd_blk_make_request); blk_queue_max_hw_sectors(q, UINT_MAX); blk_queue_logical_block_size(q, nsblk_sector_size(nsblk)); - queue_flag_set_unlocked(QUEUE_FLAG_NONROT, q); + blk_queue_flag_set(QUEUE_FLAG_NONROT, q); q->queuedata = nsblk; disk = alloc_disk(0); |