Merge branch 'linus' into stackprotector

[sfrench/cifs-2.6.git] / include / linux / magic.h

diff --git a/include/linux/magic.h b/include/linux/magic.h
index 74e68e201166c364095c85529eb5faa9ffe7ed07..a07aa79593b7790c096f7973574bc8923201ba7b 100644 (file)
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -6,6 +6,10 @@
 #define AFS_SUPER_MAGIC                0x5346414F
 #define AUTOFS_SUPER_MAGIC     0x0187
 #define CODA_SUPER_MAGIC       0x73757245
+#define DEBUGFS_MAGIC          0x64626720
+#define SYSFS_MAGIC            0x62656572
+#define SECURITYFS_MAGIC       0x73636673
+#define TMPFS_MAGIC            0x01021994
 #define EFS_SUPER_MAGIC                0x414A53
 #define EXT2_SUPER_MAGIC       0xEF53
 #define EXT3_SUPER_MAGIC       0xEF53