Merge branch 'linus' into irq/threaded

Conflicts:
	include/linux/irq.h
	kernel/irq/handle.c

1 files changed, 8 insertions, 1 deletions

diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h
index 72447370bc95..5c3434f7626f 100644
--- a/security/selinux/include/security.h
+++ b/security/selinux/include/security.h
@@ -37,15 +37,23 @@
 #define POLICYDB_VERSION_MAX    POLICYDB_VERSION_BOUNDARY
 #endif
 
+/* Mask for just the mount related flags */
+#define SE_MNTMASK      0x0f
+/* Super block security struct flags for mount options */
 #define CONTEXT_MNT     0x01
 #define FSCONTEXT_MNT   0x02
 #define ROOTCONTEXT_MNT 0x04
 #define DEFCONTEXT_MNT  0x08
+/* Non-mount related flags */
+#define SE_SBINITIALIZED        0x10
+#define SE_SBPROC               0x20
+#define SE_SBLABELSUPP  0x40
 
 #define CONTEXT_STR     "context="
 #define FSCONTEXT_STR   "fscontext="
 #define ROOTCONTEXT_STR "rootcontext="
 #define DEFCONTEXT_STR  "defcontext="
+#define LABELSUPP_STR "seclabel"
 
 struct netlbl_lsm_secattr;
 
@@ -80,7 +88,6 @@ int security_policycap_supported(unsigned int req_cap);
 #define SEL_VEC_MAX 32
 struct av_decision {
         u32 allowed;
-        u32 decided;
         u32 auditallow;
         u32 auditdeny;
         u32 seqno;