From 7c5372b44e0251f633e39bcc2735059cc6b085b5 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Fri, 25 Feb 2011 15:33:17 +0000
Subject: [PATCH] --- yaml --- r: 233655 b: refs/heads/master c:
 0a93ea2e897bd793cc0aaaddc397eff32ac8d6fe h: refs/heads/master i:   233653:
 2c4b8f4a658489a851a42c30ae7312a757de2f4c   233651:
 39e1fcadf01b92b8d1559f170842c3534410b83e   233647:
 31034df5545980307ba9bc1cd2b8f143c2ad888d v: v3

---
 [refs]                   | 2 +-
 trunk/net/rxrpc/ar-key.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c94ff65b4eb1..462543865c05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f129ccc9231c95513a1227ca9da876beeb03e577
+refs/heads/master: 0a93ea2e897bd793cc0aaaddc397eff32ac8d6fe
diff --git a/trunk/net/rxrpc/ar-key.c b/trunk/net/rxrpc/ar-key.c
index 5ee16f0353fe..d763793d39de 100644
--- a/trunk/net/rxrpc/ar-key.c
+++ b/trunk/net/rxrpc/ar-key.c
@@ -89,11 +89,11 @@ static int rxrpc_instantiate_xdr_rxkad(struct key *key, const __be32 *xdr,
 		return ret;
 
 	plen -= sizeof(*token);
-	token = kmalloc(sizeof(*token), GFP_KERNEL);
+	token = kzalloc(sizeof(*token), GFP_KERNEL);
 	if (!token)
 		return -ENOMEM;
 
-	token->kad = kmalloc(plen, GFP_KERNEL);
+	token->kad = kzalloc(plen, GFP_KERNEL);
 	if (!token->kad) {
 		kfree(token);
 		return -ENOMEM;
@@ -731,10 +731,10 @@ static int rxrpc_instantiate(struct key *key, const void *data, size_t datalen)
 		goto error;
 
 	ret = -ENOMEM;
-	token = kmalloc(sizeof(*token), GFP_KERNEL);
+	token = kzalloc(sizeof(*token), GFP_KERNEL);
 	if (!token)
 		goto error;
-	token->kad = kmalloc(plen, GFP_KERNEL);
+	token->kad = kzalloc(plen, GFP_KERNEL);
 	if (!token->kad)
 		goto error_free;