Merge branch 'linus' into stackprotector

[pandora-kernel.git] / include / linux / magic.h

diff --git a/include/linux/magic.h b/include/linux/magic.h
index a9c6567..a07aa79 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
@@ -13,7 +17,7 @@
 #define HPFS_SUPER_MAGIC       0xf995e849
 #define ISOFS_SUPER_MAGIC      0x9660
 #define JFFS2_SUPER_MAGIC      0x72b6
-#define KVMFS_SUPER_MAGIC      0x19700426
+#define ANON_INODE_FS_MAGIC    0x09041934
 
 #define MINIX_SUPER_MAGIC      0x137F          /* original minix fs */
 #define MINIX_SUPER_MAGIC2     0x138F          /* minix fs, 30 char names */
@@ -37,5 +41,10 @@
 
 #define SMB_SUPER_MAGIC                0x517B
 #define USBDEVICE_SUPER_MAGIC  0x9fa2
+#define CGROUP_SUPER_MAGIC     0x27e0eb
 
+#define FUTEXFS_SUPER_MAGIC    0xBAD1DEA
+#define INOTIFYFS_SUPER_MAGIC  0x2BAD1DEA
+
+#define STACK_END_MAGIC                0x57AC6E9D
 #endif /* __LINUX_MAGIC_H__ */