From 3080dee4a4bb4c33978307becbb11de8d6b2f450 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Tue, 10 Jan 2006 13:08:21 -0800
Subject: [PATCH] --- yaml --- r: 17807 b: refs/heads/master c:
 12fe2c588df77d60dfe13b432f95d00f76b8c969 h: refs/heads/master i:   17805:
 394b3426cd8581659db8b1850673fd3a53911f96   17803:
 786d4fbca9ab5f6c51ac63e0faacebff8afcac4b   17799:
 0806b3de76a52b9832e1a81c1a0699a3cfff05a1   17791:
 5f7bd125d8db075d945bc4e4dfd6b133344c35b9 v: v3

---
 [refs]                         | 2 +-
 trunk/net/bluetooth/hci_conn.c | 2 +-
 trunk/net/sunrpc/svc.c         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d852c288c76e..f603e8d2a0f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea2e90dfcee2c09eff8a180976ace071922663a5
+refs/heads/master: 12fe2c588df77d60dfe13b432f95d00f76b8c969
diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c
index a31244e58888..f812ed129e58 100644
--- a/trunk/net/bluetooth/hci_conn.c
+++ b/trunk/net/bluetooth/hci_conn.c
@@ -403,7 +403,7 @@ int hci_get_conn_list(void __user *arg)
 
 	size = sizeof(req) + req.conn_num * sizeof(*ci);
 
-	if (!(cl = (void *) kmalloc(size, GFP_KERNEL)))
+	if (!(cl = kmalloc(size, GFP_KERNEL)))
 		return -ENOMEM;
 
 	if (!(hdev = hci_dev_get(req.dev_id))) {
diff --git a/trunk/net/sunrpc/svc.c b/trunk/net/sunrpc/svc.c
index b19cc26fa9c2..a8bd34d47425 100644
--- a/trunk/net/sunrpc/svc.c
+++ b/trunk/net/sunrpc/svc.c
@@ -166,8 +166,8 @@ svc_create_thread(svc_thread_fn func, struct svc_serv *serv)
 	memset(rqstp, 0, sizeof(*rqstp));
 	init_waitqueue_head(&rqstp->rq_wait);
 
-	if (!(rqstp->rq_argp = (u32 *) kmalloc(serv->sv_xdrsize, GFP_KERNEL))
-	 || !(rqstp->rq_resp = (u32 *) kmalloc(serv->sv_xdrsize, GFP_KERNEL))
+	if (!(rqstp->rq_argp = kmalloc(serv->sv_xdrsize, GFP_KERNEL))
+	 || !(rqstp->rq_resp = kmalloc(serv->sv_xdrsize, GFP_KERNEL))
 	 || !svc_init_buffer(rqstp, serv->sv_bufsz))
 		goto out_thread;