diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-09-19 12:27:10 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-09-19 12:27:10 +1000 |
| commit | de2f4b3453d29934ceb41eccebd55ab087e17d6c (patch) | |
| tree | c8f363bd1ddddc5bc382e624d47c507ee956d19d /security/selinux/include/security.h | |
| parent | e350e24694e447e6ab7312fffae5ca31a0bb5165 (diff) | |
| parent | 9b6a9ecc2d88ccdc57efc22d69436b9dd7e2eceb (diff) | |
| download | linux-de2f4b3453d29934ceb41eccebd55ab087e17d6c.tar.gz linux-de2f4b3453d29934ceb41eccebd55ab087e17d6c.tar.xz | |
Merge branch 'stable-4.9' 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 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h index 38feb55d531a..308a286c6cbe 100644 --- a/security/selinux/include/security.h +++ b/security/selinux/include/security.h @@ -39,11 +39,7 @@ /* Range of policy versions we understand*/ #define POLICYDB_VERSION_MIN POLICYDB_VERSION_BASE -#ifdef CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX -#define POLICYDB_VERSION_MAX CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX_VALUE -#else #define POLICYDB_VERSION_MAX POLICYDB_VERSION_XPERMS_IOCTL -#endif /* Mask for just the mount related flags */ #define SE_MNTMASK 0x0f |