summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilad Broner <gbroner@codeaurora.org>2016-03-13 15:58:50 +0200
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 21:24:20 -0700
commit28e3a4040ee49cd184a9868a11305fa7adb8f1d4 (patch)
tree07bf3ac8559afca8312ce8bb85f9ccd0ff320216
parenteca2a5ea722eb317abb8868312c3a11acd530327 (diff)
selinux: removed redundant headers from objsec.h
flask.h was included in the above file. This is autogenerated header which gets produced during compilation of selinux. This causes issues for other module (PFK) which includes objsec.h and compiles after selinux. Since removal of the above headers does not break compilation, they seem to be redundant and can be removed. Signed-off-by: Gilad Broner <gbroner@codeaurora.org>
-rw-r--r--security/selinux/include/objsec.h3
-rw-r--r--security/selinux/include/security.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h
index b4f6589593a9..f6027d67a0e6 100644
--- a/security/selinux/include/objsec.h
+++ b/security/selinux/include/objsec.h
@@ -25,8 +25,7 @@
#include <linux/in.h>
#include <linux/spinlock.h>
#include <net/net_namespace.h>
-#include "flask.h"
-#include "avc.h"
+#include "security.h"
struct task_security_struct {
u32 osid; /* SID prior to last execve */
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h
index 223e9fd15d66..0464cbb709cd 100644
--- a/security/selinux/include/security.h
+++ b/security/selinux/include/security.h
@@ -12,7 +12,6 @@
#include <linux/dcache.h>
#include <linux/magic.h>
#include <linux/types.h>
-#include "flask.h"
#define SECSID_NULL 0x00000000 /* unspecified SID */
#define SECSID_WILD 0xffffffff /* wildcard SID */