diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-01-06 12:03:41 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-01-09 08:39:03 -0800 |
| commit | ad9a8bde2cb19f6876f964fc48acc8b6a2f325ff (patch) | |
| tree | fbbaffa5f17b6a41a6664a9b7a43d546b102fd58 /drivers | |
| parent | 0caeef63e6d2f866d85bb507bf63e0ce8ec91cef (diff) | |
| download | linux-stable-ad9a8bde2cb19f6876f964fc48acc8b6a2f325ff.tar.gz linux-stable-ad9a8bde2cb19f6876f964fc48acc8b6a2f325ff.tar.bz2 linux-stable-ad9a8bde2cb19f6876f964fc48acc8b6a2f325ff.zip | |
libnvdimm, pmem: move definition of nvdimm_namespace_add_poison to nd.h
nd-core.h is private to the libnvdimm core internals and should not be
used by drivers.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nvdimm/nd-core.h | 2 | ||||
| -rw-r--r-- | drivers/nvdimm/nd.h | 2 | ||||
| -rw-r--r-- | drivers/nvdimm/pmem.c | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/nvdimm/nd-core.h b/drivers/nvdimm/nd-core.h index d3b7ea78df96..29acdaa757e2 100644 --- a/drivers/nvdimm/nd-core.h +++ b/drivers/nvdimm/nd-core.h @@ -90,6 +90,4 @@ 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); -int nvdimm_namespace_add_poison(struct gendisk *disk, resource_size_t offset, - struct nd_namespace_common *ndns); #endif /* __ND_CORE_H__ */ diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h index ba91fcd5818d..198933da83e5 100644 --- a/drivers/nvdimm/nd.h +++ b/drivers/nvdimm/nd.h @@ -268,6 +268,8 @@ int nvdimm_namespace_attach_btt(struct nd_namespace_common *ndns); int nvdimm_namespace_detach_btt(struct nd_namespace_common *ndns); const char *nvdimm_namespace_disk_name(struct nd_namespace_common *ndns, char *name); +int nvdimm_namespace_add_poison(struct gendisk *disk, resource_size_t offset, + struct nd_namespace_common *ndns); int nd_blk_region_init(struct nd_region *nd_region); void __nd_iostat_start(struct bio *bio, unsigned long *start); static inline bool nd_iostat_start(struct bio *bio, unsigned long *start) diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 5b95043443a3..65b2056e7540 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -27,7 +27,6 @@ #include <linux/slab.h> #include <linux/pmem.h> #include <linux/nd.h> -#include "nd-core.h" #include "pfn.h" #include "nd.h" |