Merge branch 'for-4.13/dax' into libnvdimm-for-next

[karo-tx-linux.git] / include / linux / libnvdimm.h

diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h
index a8ee1d0afd701088df79acc241af5aedb1de8673..f3d3e6af8838d9949426a9448e744bbb20cde770 100644 (file)
--- a/include/linux/libnvdimm.h
+++ b/include/linux/libnvdimm.h
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 #include <linux/types.h>
+#include <linux/uuid.h>
 
 enum {
        /* when a dimm supports both PMEM and BLK access a label is required */
@@ -54,6 +55,7 @@ typedef int (*ndctl_fn)(struct nvdimm_bus_descriptor *nd_desc,
 
 struct nvdimm_bus_descriptor {
        const struct attribute_group **attr_groups;
+       unsigned long bus_dsm_mask;
        unsigned long cmd_mask;
        struct module *module;
        char *provider_name;
@@ -71,9 +73,14 @@ struct nd_cmd_desc {
 };
 
 struct nd_interleave_set {
-       u64 cookie;
+       /* v1.1 definition of the interleave-set-cookie algorithm */
+       u64 cookie1;
+       /* v1.2 definition of the interleave-set-cookie algorithm */
+       u64 cookie2;
        /* compatibility with initial buggy Linux implementation */
        u64 altcookie;
+
+       guid_t type_guid;
 };
 
 struct nd_mapping_desc {