diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-05-05 19:31:34 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-05-05 19:31:34 -0400 |
| commit | a6926cc989eb8e3349ae9b858177608e86f7257c (patch) | |
| tree | 201583130b6b5d323ba3c5b3ef44565bf113f5f1 /security/selinux/include/objsec.h | |
| parent | 0250abcd726b4eba8a6175f09656fe544ed6491a (diff) | |
| parent | c2316dbf124257ae19fd2e29cb5ec51060649d38 (diff) | |
Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/selinux/include/objsec.h')
| -rw-r--r-- | security/selinux/include/objsec.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h index a2ae05414ba1..c21e135460a5 100644 --- a/security/selinux/include/objsec.h +++ b/security/selinux/include/objsec.h | |||
| @@ -38,9 +38,8 @@ struct task_security_struct { | |||
| 38 | }; | 38 | }; |
| 39 | 39 | ||
| 40 | enum label_initialized { | 40 | enum label_initialized { |
| 41 | LABEL_MISSING, /* not initialized */ | 41 | LABEL_INVALID, /* invalid or not initialized */ |
| 42 | LABEL_INITIALIZED, /* inizialized */ | 42 | LABEL_INITIALIZED /* initialized */ |
| 43 | LABEL_INVALID /* invalid */ | ||
| 44 | }; | 43 | }; |
| 45 | 44 | ||
| 46 | struct inode_security_struct { | 45 | struct inode_security_struct { |