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>

diff --git a/drivers/nvdimm/nd-core.h b/drivers/nvdimm/nd-core.h
index d3b7ea78df96bdba7e3ce18707cc56a941b4da57..29acdaa757e2432d3a8edebc62a734f53f776423 100644 (file)
--- 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 ba91fcd5818db1be3541e60e671fa00fbf92fe2e..198933da83e5a4ca4dd1c3b0cd40b5a92a30843b 100644 (file)
--- 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 5b95043443a39ebbeb77392169292172b1382052..65b2056e75404293e66c78a0526c45f451454624 100644 (file)
--- 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"