diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-15 07:46:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-15 07:46:29 -0400 |
| commit | b2aaf8f74cdc84a9182f6cabf198b7763bcb9d40 (patch) | |
| tree | 53ccb1c2c14751fe69cf93102e76e97021f6df07 /include/linux/magic.h | |
| parent | 4f962d4d65923d7b722192e729840cfb79af0a5a (diff) | |
| parent | 278429cff8809958d25415ba0ed32b59866ab1a8 (diff) | |
Merge branch 'linus' into stackprotector
Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h
Diffstat (limited to 'include/linux/magic.h')
| -rw-r--r-- | include/linux/magic.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/magic.h b/include/linux/magic.h index 74e68e201166..a07aa79593b7 100644 --- a/include/linux/magic.h +++ b/include/linux/magic.h | |||
| @@ -6,6 +6,10 @@ | |||
| 6 | #define AFS_SUPER_MAGIC 0x5346414F | 6 | #define AFS_SUPER_MAGIC 0x5346414F |
| 7 | #define AUTOFS_SUPER_MAGIC 0x0187 | 7 | #define AUTOFS_SUPER_MAGIC 0x0187 |
| 8 | #define CODA_SUPER_MAGIC 0x73757245 | 8 | #define CODA_SUPER_MAGIC 0x73757245 |
| 9 | #define DEBUGFS_MAGIC 0x64626720 | ||
| 10 | #define SYSFS_MAGIC 0x62656572 | ||
| 11 | #define SECURITYFS_MAGIC 0x73636673 | ||
| 12 | #define TMPFS_MAGIC 0x01021994 | ||
| 9 | #define EFS_SUPER_MAGIC 0x414A53 | 13 | #define EFS_SUPER_MAGIC 0x414A53 |
| 10 | #define EXT2_SUPER_MAGIC 0xEF53 | 14 | #define EXT2_SUPER_MAGIC 0xEF53 |
| 11 | #define EXT3_SUPER_MAGIC 0xEF53 | 15 | #define EXT3_SUPER_MAGIC 0xEF53 |