summaryrefslogtreecommitdiffstats
path: root/net/sunrpc/auth.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 17:06:47 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 17:06:47 -0800
commit45ed344cc7b6456856b4ae5e3d81cdb18b98f8ad (patch)
treeba64db58e1d4d1fb67b3b666279ebb8e4f7fb42a /net/sunrpc/auth.c
parent99535ac2d4d95dbcad6b8d8a04ea57a891fb533b (diff)
parentbb7e8c5a55c1f5d4192f4b61a84a791796ebf0c3 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/sunrpc/auth.c')
-rw-r--r--net/sunrpc/auth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index 8c7756036e9..9ac1b8c26c0 100644
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -94,7 +94,7 @@ rpcauth_init_credcache(struct rpc_auth *auth, unsigned long expire)
struct rpc_cred_cache *new;
int i;
- new = (struct rpc_cred_cache *)kmalloc(sizeof(*new), GFP_KERNEL);
+ new = kmalloc(sizeof(*new), GFP_KERNEL);
if (!new)
return -ENOMEM;
for (i = 0; i < RPC_CREDCACHE_NR; i++)