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>

diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 873e086ce3a1c51bb6be6aa2851ef56e94494d66..249df3720be2601d23220a20b37c034350c54c95 100644 (file)
--- 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 99b36124f7121ebfa3061a528543d49b2bacb6e3..8ad30955e15d85287a3822ac16ed819b5772da11 100644 (file)
--- a/security/smack/smack.h
+++ b/security/smack/smack.h
@@ -148,11 +148,6 @@ struct smack_known {
 #define SMACK_UNLABELED_SOCKET 0
 #define SMACK_CIPSO_SOCKET     1
 
-/*
- * smackfs magic number
- */
-#define SMACK_MAGIC    0x43415d53 /* "SMAC" */
-
 /*
  * CIPSO defaults.
  */