summaryrefslogtreecommitdiff
path: root/include/uapi/linux
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2016-10-07 16:46:30 -0700
committerDan Williams <dan.j.williams@intel.com>2016-10-07 16:46:30 -0700
commite476f94482fc20a23b7b33b3d8e50f1953f71828 (patch)
tree8ac0e5812ea683b348bb70ba8c0d513e2a8f5739 /include/uapi/linux
parent178d6f4be8bf42b298bedf8ea2a00754100e0c4e (diff)
parent4e65e9381c7ac211ec2133e473fcbdd8656c779a (diff)
Merge branch 'for-4.9/dax' into libnvdimm-for-next
Diffstat (limited to 'include/uapi/linux')
-rw-r--r--include/uapi/linux/magic.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index e398beac67b8..9bd559472c92 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -65,6 +65,7 @@
#define V9FS_MAGIC 0x01021997
#define BDEVFS_MAGIC 0x62646576
+#define DAXFS_MAGIC 0x64646178
#define BINFMTFS_MAGIC 0x42494e4d
#define DEVPTS_SUPER_MAGIC 0x1cd1
#define FUTEXFS_SUPER_MAGIC 0xBAD1DEA