Browse Source

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>
Jarkko Sakkinen 12 years ago
parent
commit
cee7e44334
2 changed files with 1 additions and 5 deletions
  1. 1 0
      include/uapi/linux/magic.h
  2. 0 5
      security/smack/smack.h

+ 1 - 0
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 */

+ 0 - 5
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.
  */