Merge branch 'for-5.7/libnvdimm' into libnvdimm-for-next

[sfrench/cifs-2.6.git] / drivers / nvdimm / nd.h

diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h
index 2cf77bc859c177f67b1f4bbe74556c149db83b01..85dbb2a322b9b4d8876b22f0bdb76d62397bdeb3 100644 (file)
--- a/drivers/nvdimm/nd.h
+++ b/drivers/nvdimm/nd.h
@@ -146,6 +146,7 @@ struct nd_region {
        struct device *btt_seed;
        struct device *pfn_seed;
        struct device *dax_seed;
+       unsigned long align;
        u16 ndr_mappings;
        u64 ndr_size;
        u64 ndr_start;
@@ -252,7 +253,7 @@ int nvdimm_set_config_data(struct nvdimm_drvdata *ndd, size_t offset,
                void *buf, size_t len);
 long nvdimm_clear_poison(struct device *dev, phys_addr_t phys,
                unsigned int len);
-void nvdimm_set_aliasing(struct device *dev);
+void nvdimm_set_labeling(struct device *dev);
 void nvdimm_set_locked(struct device *dev);
 void nvdimm_clear_locked(struct device *dev);
 int nvdimm_security_setup_events(struct device *dev);