summaryrefslogtreecommitdiffstats
path: root/drivers/nvdimm/nd-core.h
diff options
context:
space:
mode:
authorDan Williams2018-12-28 04:54:10 +0100
committerDan Williams2018-12-28 04:54:10 +0100
commit4b5f747e82b12b6d8ab815fc259827a615c7f2c3 (patch)
treeec5eb3857bbb776ac521f555978fcb78cc6bd2a8 /drivers/nvdimm/nd-core.h
parentlibnvdimm/security: Quiet security operations (diff)
parentlibnvdimm, namespace: Replace kmemdup() with kstrndup() (diff)
downloadkernel-qcow2-linux-4b5f747e82b12b6d8ab815fc259827a615c7f2c3.tar.gz
kernel-qcow2-linux-4b5f747e82b12b6d8ab815fc259827a615c7f2c3.tar.xz
kernel-qcow2-linux-4b5f747e82b12b6d8ab815fc259827a615c7f2c3.zip
Merge miscellaneous libnvdimm updates for 4.21
* Use common helpers, bitmap_zalloc() and kstrndup(), to replace open coded versions. * Clarify the comments around hotplug vs initial init case for the nfit driver. * Cleanup the libnvdimm init path.
Diffstat (limited to 'drivers/nvdimm/nd-core.h')
-rw-r--r--drivers/nvdimm/nd-core.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/nvdimm/nd-core.h b/drivers/nvdimm/nd-core.h
index 52d20d9f39f6..2b2cf4e554d3 100644
--- a/drivers/nvdimm/nd-core.h
+++ b/drivers/nvdimm/nd-core.h
@@ -168,6 +168,8 @@ resource_size_t nd_pmem_available_dpa(struct nd_region *nd_region,
struct nd_mapping *nd_mapping, resource_size_t *overlap);
resource_size_t nd_blk_available_dpa(struct nd_region *nd_region);
resource_size_t nd_region_available_dpa(struct nd_region *nd_region);
+int nd_region_conflict(struct nd_region *nd_region, resource_size_t start,
+ resource_size_t size);
resource_size_t nvdimm_allocated_dpa(struct nvdimm_drvdata *ndd,
struct nd_label_id *label_id);
int alias_dpa_busy(struct device *dev, void *data);