Merge branch 'for-4.8/drivers' of git://git.kernel.dk/linux-block

[mirror_ubuntu-artful-kernel.git] / drivers / block / brd.c

diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 41a6c4c9da9f7d1310ca55f31365afa1dc6e3b14..ba5145d384d8013df86b1f36047303df26708518 100644 (file)
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -507,7 +507,9 @@ static struct brd_device *brd_alloc(int i)
        blk_queue_max_discard_sectors(brd->brd_queue, UINT_MAX);
        brd->brd_queue->limits.discard_zeroes_data = 1;
        queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, brd->brd_queue);
-
+#ifdef CONFIG_BLK_DEV_RAM_DAX
+       queue_flag_set_unlocked(QUEUE_FLAG_DAX, brd->brd_queue);
+#endif
        disk = brd->brd_disk = alloc_disk(max_part);
        if (!disk)
                goto out_free_queue;