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 /security/smack/smack.h | |
| parent | d13274794ad28d90ac81643d3d1d18338d948764 (diff) | |
| parent | cdb56b60884c687ea396ae96a418554739b40129 (diff) | |
| download | olio-linux-3.10-9b0271d8ca4d99becbf9ca1871c0d0faa5fad676.tar.xz olio-linux-3.10-9b0271d8ca4d99becbf9ca1871c0d0faa5fad676.zip | |
Merge branch 'stage-for-3.10' of git://git.gitorious.org/smack-next/kernel into ra-next
Diffstat (limited to 'security/smack/smack.h')
| -rw-r--r-- | security/smack/smack.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/security/smack/smack.h b/security/smack/smack.h index 99b36124f71..8ad30955e15 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 */ |