diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-12-17 15:08:10 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-12-17 15:08:10 -0800 |
| commit | c44ef859ceff45db1c72f9ccbfae96843c4b1501 (patch) | |
| tree | c97d8cab54f9d62faa5a5713298418ab93a452e0 /drivers/nvdimm/dimm.c | |
| parent | 325896ffdf90f7cbd59fb873b7ba20d60d1ddf3c (diff) | |
| parent | d7fe1a67f658b50ec98ee1afb86df7b35c2b2593 (diff) | |
Merge branch 'for-4.10/libnvdimm' into libnvdimm-for-nextlibnvdimm-for-4.10
Diffstat (limited to 'drivers/nvdimm/dimm.c')
| -rw-r--r-- | drivers/nvdimm/dimm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/nvdimm/dimm.c b/drivers/nvdimm/dimm.c index 619834e144d1..ee0b412827bf 100644 --- a/drivers/nvdimm/dimm.c +++ b/drivers/nvdimm/dimm.c @@ -64,6 +64,8 @@ static int nvdimm_probe(struct device *dev) nd_label_copy(ndd, to_next_namespace_index(ndd), to_current_namespace_index(ndd)); rc = nd_label_reserve_dpa(ndd); + if (ndd->ns_current >= 0) + nvdimm_set_aliasing(dev); nvdimm_bus_unlock(dev); if (rc) |