diff options
| author |   Dan Williams <dan.j.williams@intel.com> | 2017-07-03 16:54:58 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-07-03 16:54:58 -0700 |
| commit | 9d92573fff3ec70785ef1815cc80573f70e7a921 (patch) | |
| tree | bce6e6bbad56f805d1adcebddabf9dd9e8072ce4 /drivers/nvdimm/dax_devs.c | |
| parent | libnvdimm, namespace: record 'lbasize' for pmem namespaces (diff) | |
| parent | libnvdimm, pmem: disable dax flushing when pmem is fronting a volatile region (diff) | |
| download | linux-dev-9d92573fff3ec70785ef1815cc80573f70e7a921.tar.xz linux-dev-9d92573fff3ec70785ef1815cc80573f70e7a921.zip | |
Merge branch 'for-4.13/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/nvdimm/dax_devs.c')
| -rw-r--r-- | drivers/nvdimm/dax_devs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/dax_devs.c b/drivers/nvdimm/dax_devs.c index 59f676381ae5..1bf2bd318371 100644 --- a/drivers/nvdimm/dax_devs.c +++ b/drivers/nvdimm/dax_devs.c @@ -89,7 +89,7 @@ struct device *nd_dax_create(struct nd_region *nd_region) struct device *dev = NULL; struct nd_dax *nd_dax; - if (!is_nd_pmem(&nd_region->dev)) + if (!is_memory(&nd_region->dev)) return NULL; nd_dax = nd_dax_alloc(nd_region); |