diff options
author | James Morris <jmorris@namei.org> | 2009-01-07 09:58:22 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-01-07 09:58:22 +1100 |
commit | ac8cc0fa5395fe2278e305a4cbed48e90d88d878 (patch) | |
tree | 515f577bfddd054ee4373228be7c974dfb8133af /security/selinux/include/avc_ss.h | |
parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
parent | 3699c53c485bf0168e6500d0ed18bf931584dd7c (diff) | |
download | blackbird-op-linux-ac8cc0fa5395fe2278e305a4cbed48e90d88d878.tar.gz blackbird-op-linux-ac8cc0fa5395fe2278e305a4cbed48e90d88d878.zip |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/selinux/include/avc_ss.h')
-rw-r--r-- | security/selinux/include/avc_ss.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/include/avc_ss.h b/security/selinux/include/avc_ss.h index c0d314d9f8e1..bb1ec801bdfe 100644 --- a/security/selinux/include/avc_ss.h +++ b/security/selinux/include/avc_ss.h @@ -17,16 +17,16 @@ struct av_perm_to_string { }; struct av_inherit { - u16 tclass; const char **common_pts; u32 common_base; + u16 tclass; }; struct selinux_class_perm { const struct av_perm_to_string *av_perm_to_string; u32 av_pts_len; - const char **class_to_string; u32 cts_len; + const char **class_to_string; const struct av_inherit *av_inherit; u32 av_inherit_len; }; |