Merge branch 'for-4.7/libnvdimm' into libnvdimm-for-next

[deliverable/linux.git] / include / uapi / linux / ndctl.h

diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h
index 59c61e018a869eaf2d009f2eb917e0e42f81329b..1eac426aead54231a313ed213f6096b01cc1d672 100644 (file)
--- a/include/uapi/linux/ndctl.h
+++ b/include/uapi/linux/ndctl.h
@@ -240,6 +240,7 @@ static inline const char *nvdimm_cmd_name(unsigned cmd)
 #define ND_DEVICE_NAMESPACE_IO 4    /* legacy persistent memory */
 #define ND_DEVICE_NAMESPACE_PMEM 5  /* PMEM namespace (may alias with BLK) */
 #define ND_DEVICE_NAMESPACE_BLK 6   /* BLK namespace (may alias with PMEM) */
+#define ND_DEVICE_DAX_PMEM 7        /* Device DAX interface to pmem */
 
 enum nd_driver_flags {
        ND_DRIVER_DIMM            = 1 << ND_DEVICE_DIMM,
@@ -248,6 +249,7 @@ enum nd_driver_flags {
        ND_DRIVER_NAMESPACE_IO    = 1 << ND_DEVICE_NAMESPACE_IO,
        ND_DRIVER_NAMESPACE_PMEM  = 1 << ND_DEVICE_NAMESPACE_PMEM,
        ND_DRIVER_NAMESPACE_BLK   = 1 << ND_DEVICE_NAMESPACE_BLK,
+       ND_DRIVER_DAX_PMEM        = 1 << ND_DEVICE_DAX_PMEM,
 };
 
 enum {