diff options
author | James Morris <james.l.morris@oracle.com> | 2014-07-19 03:39:19 -0400 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2014-07-19 03:39:19 -0400 |
commit | 2ccf4661f315615d018686d91d030a94001d0cc6 (patch) | |
tree | f5374b5233ba5c43a4710bc8cbc5319091da044e /security/selinux/include/security.h | |
parent | 32c2e6752ff0f48fe03b9e1c7c64bde580a840d2 (diff) | |
parent | 615e51fdda6f274e94b1e905fcaf6111e0d9aa20 (diff) |
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/selinux/include/security.h')
-rw-r--r-- | security/selinux/include/security.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h index ce7852cf526b..d1e0b239b602 100644 --- a/security/selinux/include/security.h +++ b/security/selinux/include/security.h | |||
@@ -8,6 +8,7 @@ | |||
8 | #ifndef _SELINUX_SECURITY_H_ | 8 | #ifndef _SELINUX_SECURITY_H_ |
9 | #define _SELINUX_SECURITY_H_ | 9 | #define _SELINUX_SECURITY_H_ |
10 | 10 | ||
11 | #include <linux/compiler.h> | ||
11 | #include <linux/dcache.h> | 12 | #include <linux/dcache.h> |
12 | #include <linux/magic.h> | 13 | #include <linux/magic.h> |
13 | #include <linux/types.h> | 14 | #include <linux/types.h> |
@@ -220,7 +221,7 @@ struct selinux_kernel_status { | |||
220 | /* | 221 | /* |
221 | * The version > 0 supports above members. | 222 | * The version > 0 supports above members. |
222 | */ | 223 | */ |
223 | } __attribute__((packed)); | 224 | } __packed; |
224 | 225 | ||
225 | extern void selinux_status_update_setenforce(int enforcing); | 226 | extern void selinux_status_update_setenforce(int enforcing); |
226 | extern void selinux_status_update_policyload(int seqno); | 227 | extern void selinux_status_update_policyload(int seqno); |