aboutsummaryrefslogtreecommitdiff
path: root/kernel/audit.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-02-14 12:15:46 +0000
committerMark Brown <broonie@linaro.org>2014-02-14 12:15:46 +0000
commit8415e604452966f981f20cb4d8a8a30e38a772dd (patch)
tree0c111cf6c6ed487c9baee37275621097d57f5127 /kernel/audit.c
parent4b9c8ddadce3ec70fa5d93875adeda861b21c84e (diff)
parent29b5f720990fafc302a034468455426dd662e101 (diff)
downloadlinaro-lsk-8415e604452966f981f20cb4d8a8a30e38a772dd.tar.gz
Merge tag 'v3.10.30' into linux-linaro-lskHEADlinux-linaro-lsk-v3.10linux-linaro-lsk
This is the 3.10.30 stable release
Diffstat (limited to 'kernel/audit.c')
-rw-r--r--kernel/audit.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/audit.c b/kernel/audit.c
index 7ddfd8a00a2..6def25f1b35 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -103,7 +103,8 @@ static int audit_rate_limit;
/* Number of outstanding audit_buffers allowed. */
static int audit_backlog_limit = 64;
-static int audit_backlog_wait_time = 60 * HZ;
+#define AUDIT_BACKLOG_WAIT_TIME (60 * HZ)
+static int audit_backlog_wait_time = AUDIT_BACKLOG_WAIT_TIME;
static int audit_backlog_wait_overflow = 0;
/* The identity of the user shutting down the audit system. */
@@ -1135,6 +1136,8 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
return NULL;
}
+ audit_backlog_wait_time = AUDIT_BACKLOG_WAIT_TIME;
+
ab = audit_buffer_alloc(ctx, gfp_mask, type);
if (!ab) {
audit_log_lost("out of memory in audit_log_start");