On 11/8/2012 10:08 AM, Jarkko Sakkinen wrote: > SMACK_MAGIC moved to a proper place for easy user space access > (i.e. libsmack). > > Signed-off-by: Jarkko Sakkinen <jarkko.sakki...@iki.fi>
I will apply once James updates the next branch of his security tree. > --- > include/uapi/linux/magic.h | 1 + > security/smack/smack.h | 6 +----- > security/smack/smack_lsm.c | 1 - > 3 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h > index e15192c..12735ad 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 99b3612..e3e7a4f 100644 > --- a/security/smack/smack.h > +++ b/security/smack/smack.h > @@ -21,6 +21,7 @@ > #include <linux/list.h> > #include <linux/rculist.h> > #include <linux/lsm_audit.h> > +#include <linux/magic.h> > > /* > * Smack labels were limited to 23 characters for a long time. > @@ -149,11 +150,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 */ > diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c > index 38be92c..6e8fa99 100644 > --- a/security/smack/smack_lsm.c > +++ b/security/smack/smack_lsm.c > @@ -32,7 +32,6 @@ > #include <linux/pipe_fs_i.h> > #include <net/cipso_ipv4.h> > #include <linux/audit.h> > -#include <linux/magic.h> > #include <linux/dcache.h> > #include <linux/personality.h> > #include <linux/msg.h> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/