diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /security/selinux/avc.c | |
| parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'security/selinux/avc.c')
| -rw-r--r-- | security/selinux/avc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/security/selinux/avc.c b/security/selinux/avc.c index 53d6c7bbf564..ac5d69bb3377 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c | |||
| @@ -43,13 +43,11 @@ static const struct av_perm_to_string | |||
| 43 | #undef S_ | 43 | #undef S_ |
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | #ifdef CONFIG_AUDIT | ||
| 47 | static const char *class_to_string[] = { | 46 | static const char *class_to_string[] = { |
| 48 | #define S_(s) s, | 47 | #define S_(s) s, |
| 49 | #include "class_to_string.h" | 48 | #include "class_to_string.h" |
| 50 | #undef S_ | 49 | #undef S_ |
| 51 | }; | 50 | }; |
| 52 | #endif | ||
| 53 | 51 | ||
| 54 | #define TB_(s) static const char * s [] = { | 52 | #define TB_(s) static const char * s [] = { |
| 55 | #define TE_(s) }; | 53 | #define TE_(s) }; |