Merge branch 'linus' into stackprotector

[~andy/linux] / include / linux / magic.h

diff --git a/include/linux/magic.h b/include/linux/magic.h
index f7f3fdddbef0b5f4f599cd506c524e4c9bf0b911..a07aa79593b7790c096f7973574bc8923201ba7b 100644 (file)
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -46,4 +46,5 @@
 #define FUTEXFS_SUPER_MAGIC    0xBAD1DEA
 #define INOTIFYFS_SUPER_MAGIC  0x2BAD1DEA
 
+#define STACK_END_MAGIC                0x57AC6E9D
 #endif /* __LINUX_MAGIC_H__ */