diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-05-21 22:33:04 +0300 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-21 22:33:04 +0300 |
| commit | 36092ee8ba695fce023b2118ececa6c2a56b1331 (patch) | |
| tree | b9579893cdd559e7b72fa569003b19792de58fad /drivers/nvdimm/nd-core.h | |
| parent | 1b982baf75e7d9585967fcfccd05b77bf9054010 (diff) | |
| parent | 03dca343afe080968d90c4d9196404b5bbbc8461 (diff) | |
| download | linux-36092ee8ba695fce023b2118ececa6c2a56b1331.tar.xz | |
Merge branch 'for-4.7/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/nvdimm/nd-core.h')
| -rw-r--r-- | drivers/nvdimm/nd-core.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/nvdimm/nd-core.h b/drivers/nvdimm/nd-core.h index 86d985ccce82..284cdaa268cf 100644 --- a/drivers/nvdimm/nd-core.h +++ b/drivers/nvdimm/nd-core.h @@ -49,6 +49,8 @@ bool is_nd_blk(struct device *dev); struct nvdimm_bus *walk_to_nvdimm_bus(struct device *nd_dev); int __init nvdimm_bus_init(void); void nvdimm_bus_exit(void); +void nvdimm_devs_exit(void); +void nd_region_devs_exit(void); void nd_region_probe_success(struct nvdimm_bus *nvdimm_bus, struct device *dev); struct nd_region; void nd_region_create_blk_seed(struct nd_region *nd_region); @@ -92,4 +94,5 @@ bool __nd_attach_ndns(struct device *dev, struct nd_namespace_common *attach, ssize_t nd_namespace_store(struct device *dev, struct nd_namespace_common **_ndns, const char *buf, size_t len); +struct nd_pfn *to_nd_pfn_safe(struct device *dev); #endif /* __ND_CORE_H__ */ |