diff options
| author | Dan Williams | 2016-05-18 18:59:34 +0200 |
|---|---|---|
| committer | Dan Williams | 2016-05-18 18:59:34 +0200 |
| commit | 594d6d96ea042366878aa7dc7f5711b8c245db5a (patch) | |
| tree | 1b7333bf5b5c1147e136f050d686ab4f888ab85f /drivers/nvdimm/region.c | |
| parent | libnvdimm, pfn: fix ARCH=alpha allmodconfig build failure (diff) | |
| parent | libnvdimm, dax: record the specified alignment of a dax-device instance (diff) | |
| download | kernel-qcow2-linux-594d6d96ea042366878aa7dc7f5711b8c245db5a.tar.gz kernel-qcow2-linux-594d6d96ea042366878aa7dc7f5711b8c245db5a.tar.xz kernel-qcow2-linux-594d6d96ea042366878aa7dc7f5711b8c245db5a.zip | |
Merge branch 'for-4.7/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/nvdimm/region.c')
| -rw-r--r-- | drivers/nvdimm/region.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/nvdimm/region.c b/drivers/nvdimm/region.c index 4b7715e29cff..05a912359939 100644 --- a/drivers/nvdimm/region.c +++ b/drivers/nvdimm/region.c @@ -54,6 +54,7 @@ static int nd_region_probe(struct device *dev) nd_region->btt_seed = nd_btt_create(nd_region); nd_region->pfn_seed = nd_pfn_create(nd_region); + nd_region->dax_seed = nd_dax_create(nd_region); if (err == 0) return 0; @@ -86,6 +87,7 @@ static int nd_region_remove(struct device *dev) nd_region->ns_seed = NULL; nd_region->btt_seed = NULL; nd_region->pfn_seed = NULL; + nd_region->dax_seed = NULL; dev_set_drvdata(dev, NULL); nvdimm_bus_unlock(dev); |