Merge branch 'for-4.16/nfit' into libnvdimm-for-next

[sfrench/cifs-2.6.git] / drivers / nvdimm / pmem.c

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index cf074b1ce219e3f2d7c1e134beeae3fa37689e1a..10041ac4032c038db09109b8f757a8719d26f902 100644 (file)
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -35,6 +35,7 @@
 #include "pmem.h"
 #include "pfn.h"
 #include "nd.h"
+#include "nd-core.h"
 
 static struct device *to_dev(struct pmem_device *pmem)
 {
@@ -334,7 +335,8 @@ static int pmem_attach_disk(struct device *dev,
                dev_warn(dev, "unable to guarantee persistence of writes\n");
                fua = 0;
        }
-       wbc = nvdimm_has_cache(nd_region);
+       wbc = nvdimm_has_cache(nd_region) &&
+               !test_bit(ND_REGION_PERSIST_CACHE, &nd_region->flags);
 
        if (!devm_request_mem_region(dev, res->start, resource_size(res),
                                dev_name(&ndns->dev))) {