Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 1 insertions, 1 deletions

diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index f3104035e35d..ade730eaf401 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -719,7 +719,7 @@ static void rpc_async_schedule(void *arg)
 void *
 rpc_malloc(struct rpc_task *task, size_t size)
 {
-        int     gfp;
+        unsigned int __nocast   gfp;
 
         if (task->tk_flags & RPC_TASK_SWAPPER)
                 gfp = GFP_ATOMIC;