From 6ca3a8a419a237310e4621e4eba2a3968362392d Mon Sep 17 00:00:00 2001
From: Rakib Mullick <rakib.mullick@gmail.com>
Date: Mon, 29 Apr 2013 15:05:13 -0700
Subject: [PATCH] --- yaml --- r: 365319 b: refs/heads/master c:
 3f68613f39cdc242fa2e872ac04a802e7cc7b7cb h: refs/heads/master i:   365317:
 4cf2fcff96b5ceb9016798541e1a3676bc4dbe31   365315:
 3b121d2960e96c2e94873802566ecc8e0e75cf70   365311:
 6535af670fc31a4200fdb19a4b6194cec0a75dc1 v: v3

---
 [refs]                 |  2 +-
 trunk/kernel/auditsc.c | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index fb95b7b3014a..806506458d34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5c5442bb6bce0c67701d55124be561043a51faf
+refs/heads/master: 3f68613f39cdc242fa2e872ac04a802e7cc7b7cb
diff --git a/trunk/kernel/auditsc.c b/trunk/kernel/auditsc.c
index a371f857a0a9..c68229411a7c 100644
--- a/trunk/kernel/auditsc.c
+++ b/trunk/kernel/auditsc.c
@@ -1034,21 +1034,15 @@ static inline void audit_free_aux(struct audit_context *context)
 	}
 }
 
-static inline void audit_zero_context(struct audit_context *context,
-				      enum audit_state state)
-{
-	memset(context, 0, sizeof(*context));
-	context->state      = state;
-	context->prio = state == AUDIT_RECORD_CONTEXT ? ~0ULL : 0;
-}
-
 static inline struct audit_context *audit_alloc_context(enum audit_state state)
 {
 	struct audit_context *context;
 
-	if (!(context = kmalloc(sizeof(*context), GFP_KERNEL)))
+	context = kzalloc(sizeof(*context), GFP_KERNEL);
+	if (!context)
 		return NULL;
-	audit_zero_context(context, state);
+	context->state = state;
+	context->prio = state == AUDIT_RECORD_CONTEXT ? ~0ULL : 0;
 	INIT_LIST_HEAD(&context->killed_trees);
 	INIT_LIST_HEAD(&context->names_list);
 	return context;