diff options
| author | Jarkko Sakkinen <jarkko.sakkinen@iki.fi> | 2012-11-06 10:17:49 +0200 |
|---|---|---|
| committer | Casey Schaufler <casey@schaufler-ca.com> | 2013-03-19 14:16:15 -0700 |
| commit | cee7e443344a3845e5b9111614b41e0b1afb60ce (patch) | |
| tree | 5f2f11bc5d1f25b7dd37517e9763a9b0449cffe8 | |
| parent | a87d79ad7cfa299aa14bb22758313dec33909875 (diff) | |
| download | linux-cee7e443344a3845e5b9111614b41e0b1afb60ce.tar.bz2 | |
smack: SMACK_MAGIC to include/uapi/linux/magic.h
SMACK_MAGIC moved to a proper place for easy user space access
(i.e. libsmack).
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@iki.fi>
| -rw-r--r-- | include/uapi/linux/magic.h | 1 | ||||
| -rw-r--r-- | security/smack/smack.h | 5 |
2 files changed, 1 insertions, 5 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 */ diff --git a/security/smack/smack.h b/security/smack/smack.h index 99b36124f712..8ad30955e15d 100644 --- a/security/smack/smack.h +++ b/security/smack/smack.h @@ -149,11 +149,6 @@ struct smack_known { #define SMACK_CIPSO_SOCKET 1 /* - * smackfs magic number - */ -#define SMACK_MAGIC 0x43415d53 /* "SMAC" */ - -/* * CIPSO defaults. */ #define SMACK_CIPSO_DOI_DEFAULT 3 /* Historical */ |