audit: Rename enum audit_state constants to avoid AUDIT_DISABLED redefinition

[linux-2.6-microblaze.git] / kernel / audit.h

diff --git a/kernel/audit.h b/kernel/audit.h
index 1522e10..e518ad9 100644 (file)
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -21,16 +21,16 @@
    a per-task filter.  At syscall entry, the audit_state is augmented by
    the syscall filter. */
 enum audit_state {
-       AUDIT_DISABLED,         /* Do not create per-task audit_context.
+       AUDIT_STATE_DISABLED,   /* Do not create per-task audit_context.
                                 * No syscall-specific audit records can
                                 * be generated. */
-       AUDIT_BUILD_CONTEXT,    /* Create the per-task audit_context,
+       AUDIT_STATE_BUILD,      /* Create the per-task audit_context,
                                 * and fill it in at syscall
                                 * entry time.  This makes a full
                                 * syscall record available if some
                                 * other part of the kernel decides it
                                 * should be recorded. */
-       AUDIT_RECORD_CONTEXT    /* Create the per-task audit_context,
+       AUDIT_STATE_RECORD      /* Create the per-task audit_context,
                                 * always fill it in at syscall entry
                                 * time, and always write out the audit
                                 * record at syscall exit time.  */
@@ -322,7 +322,7 @@ static inline int audit_signal_info_syscall(struct task_struct *t)
        return 0;
 }
 
-#define audit_filter_inodes(t, c) AUDIT_DISABLED
+#define audit_filter_inodes(t, c) AUDIT_STATE_DISABLED
 #endif /* CONFIG_AUDITSYSCALL */
 
 extern char *audit_unpack_string(void **bufp, size_t *remain, size_t len);