diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-05 16:50:23 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-05 16:50:23 -0400 |
| commit | aad61439e6a00bdb72cb649e11f6e166590c5f66 (patch) | |
| tree | 2279f3c2a15f81526d14182c6acb358cafd0b359 /security/selinux/include/security.h | |
| parent | 3c304956755fa63ee80ca51ce38078fe1c4e8818 (diff) | |
| parent | d98550e334715b2d9e45f8f0f4e1608720108640 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'security/selinux/include/security.h')
| -rw-r--r-- | security/selinux/include/security.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h index 5f016c98056f..063af47bb231 100644 --- a/security/selinux/include/security.h +++ b/security/selinux/include/security.h | |||
| @@ -29,12 +29,7 @@ | |||
| 29 | #define POLICYDB_VERSION_MIN POLICYDB_VERSION_BASE | 29 | #define POLICYDB_VERSION_MIN POLICYDB_VERSION_BASE |
| 30 | #define POLICYDB_VERSION_MAX POLICYDB_VERSION_AVTAB | 30 | #define POLICYDB_VERSION_MAX POLICYDB_VERSION_AVTAB |
| 31 | 31 | ||
| 32 | #ifdef CONFIG_SECURITY_SELINUX_BOOTPARAM | ||
| 33 | extern int selinux_enabled; | 32 | extern int selinux_enabled; |
| 34 | #else | ||
| 35 | #define selinux_enabled 1 | ||
| 36 | #endif | ||
| 37 | |||
| 38 | extern int selinux_mls_enabled; | 33 | extern int selinux_mls_enabled; |
| 39 | 34 | ||
| 40 | int security_load_policy(void * data, size_t len); | 35 | int security_load_policy(void * data, size_t len); |