diff options
| author | James Morris <jmorris@namei.org> | 2008-10-09 20:09:47 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-10-09 20:09:47 -0400 |
| commit | 9ac684fc38cf17fbd25c0c9e388713c5ddfa3b14 (patch) | |
| tree | f2715b294d64efe1c5788f4fa5f0b25cdff071a7 /security/selinux/ss/conditional.h | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| parent | 81990fbdd18b9cfdc93dc221ff3250f81468aed8 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/selinux/ss/conditional.h')
| -rw-r--r-- | security/selinux/ss/conditional.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/ss/conditional.h b/security/selinux/ss/conditional.h index 65b9f8366e9c..53ddb013ae57 100644 --- a/security/selinux/ss/conditional.h +++ b/security/selinux/ss/conditional.h | |||
| @@ -28,7 +28,7 @@ struct cond_expr { | |||
| 28 | #define COND_XOR 5 /* bool ^ bool */ | 28 | #define COND_XOR 5 /* bool ^ bool */ |
| 29 | #define COND_EQ 6 /* bool == bool */ | 29 | #define COND_EQ 6 /* bool == bool */ |
| 30 | #define COND_NEQ 7 /* bool != bool */ | 30 | #define COND_NEQ 7 /* bool != bool */ |
| 31 | #define COND_LAST 8 | 31 | #define COND_LAST COND_NEQ |
| 32 | __u32 expr_type; | 32 | __u32 expr_type; |
| 33 | __u32 bool; | 33 | __u32 bool; |
| 34 | struct cond_expr *next; | 34 | struct cond_expr *next; |