Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2

[linux-2.6-omap-h63xx.git] / security / selinux / include / avc_ss.h

diff --git a/security/selinux/include/avc_ss.h b/security/selinux/include/avc_ss.h
index ff869e8b6f4a044852234c78b6e412000eac8153..bb1ec801bdfe1dda2984b27da8ecef52c2715755 100644 (file)
--- a/security/selinux/include/avc_ss.h
+++ b/security/selinux/include/avc_ss.h
@@ -10,26 +10,23 @@
 
 int avc_ss_reset(u32 seqno);
 
-struct av_perm_to_string
-{
+struct av_perm_to_string {
        u16 tclass;
        u32 value;
        const char *name;
 };
 
-struct av_inherit
-{
-       u16 tclass;
+struct av_inherit {
        const char **common_pts;
        u32 common_base;
+       u16 tclass;
 };
 
-struct selinux_class_perm
-{
+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;
 };