1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 45328d8b2859..bac79f40f3cb 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1805,7 +1805,7 @@ static void cleanup_mapped_device(struct mapped_device *md)
 static struct mapped_device *alloc_dev(int minor)
 {
         int r, numa_node_id = dm_get_numa_node();
-        struct dax_device *dax_dev;
+        struct dax_device *dax_dev = NULL;
         struct mapped_device *md;
         void *old_md;
 
@@ -1871,9 +1871,11 @@ static struct mapped_device *alloc_dev(int minor)
         md->disk->private_data = md;
         sprintf(md->disk->disk_name, "dm-%d", minor);
 
-        dax_dev = alloc_dax(md, md->disk->disk_name, &dm_dax_ops);
-        if (!dax_dev)
-                goto bad;
+        if (IS_ENABLED(CONFIG_DAX_DRIVER)) {
+                dax_dev = alloc_dax(md, md->disk->disk_name, &dm_dax_ops);
+                if (!dax_dev)
+                        goto bad;
+        }
         md->dax_dev = dax_dev;
 
         add_disk_no_queue_reg(md->disk);