diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 09:59:34 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 09:59:34 -0700 |
| commit | 594d6d96ea042366878aa7dc7f5711b8c245db5a (patch) | |
| tree | 1b7333bf5b5c1147e136f050d686ab4f888ab85f /include/uapi | |
| parent | 1b8d2afde54fade94339f573c4e05644f9ae9866 (diff) | |
| parent | 45a0dac0451136fa7ae34a6fea53ef6a136287ce (diff) | |
Merge branch 'for-4.7/dax' into libnvdimm-for-next
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/ndctl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h index 7cc28ab05b87..4f29d247f709 100644 --- a/include/uapi/linux/ndctl.h +++ b/include/uapi/linux/ndctl.h @@ -206,6 +206,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, @@ -214,6 +215,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 { |