diff options
| author |   James Morris <james.l.morris@oracle.com> | 2013-04-02 01:45:36 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2013-04-02 01:45:36 +1100 |
| commit | 9b0271d8ca4d99becbf9ca1871c0d0faa5fad676 (patch) | |
| tree | e23f854c68dd553633b93ef4556607b1a143feaa /include/uapi/linux | |
| parent | seccomp: allow BPF_XOR based ALU instructions. (diff) | |
| parent | Fix NULL pointer dereference in smack_inode_unlink() and smack_inode_rmdir() (diff) | |
Merge branch 'stage-for-3.10' of git://git.gitorious.org/smack-next/kernel into ra-next
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/magic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 873e086ce3a1..249df3720be2 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -11,6 +11,7 @@ #define DEBUGFS_MAGIC 0x64626720 #define SECURITYFS_MAGIC 0x73636673 #define SELINUX_MAGIC 0xf97cff8c +#define SMACK_MAGIC 0x43415d53 /* "SMAC" */ #define RAMFS_MAGIC 0x858458f6 /* some random number */ #define TMPFS_MAGIC 0x01021994 #define HUGETLBFS_MAGIC 0x958458f6 /* some random number */ |