From b643c2849a13335fbb4ffd581745697500628b22 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Tue, 4 Oct 2005 22:44:45 -0700
Subject: [PATCH] --- yaml --- r: 9667 b: refs/heads/master c:
 dd13a285b79ba77416b96ee10f49097f4aaf48c5 h: refs/heads/master i:   9665:
 cbea1257e450f6a1dde440160e85c399db69d2fc   9663:
 da7b33b89e7fce93b2da9d7db1dfba91c586d967 v: v3

---
 [refs]                        | 2 +-
 trunk/include/rxrpc/call.h    | 2 +-
 trunk/include/rxrpc/message.h | 2 +-
 trunk/net/rxrpc/call.c        | 2 +-
 trunk/net/rxrpc/connection.c  | 2 +-
 trunk/net/sunrpc/sched.c      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 69e882733784..c1ecac938e30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00fa02334540ec795934737cd6e6ef8db2560731
+refs/heads/master: dd13a285b79ba77416b96ee10f49097f4aaf48c5
diff --git a/trunk/include/rxrpc/call.h b/trunk/include/rxrpc/call.h
index f48f27e9e0ab..8118731e7d96 100644
--- a/trunk/include/rxrpc/call.h
+++ b/trunk/include/rxrpc/call.h
@@ -203,7 +203,7 @@ extern int rxrpc_call_write_data(struct rxrpc_call *call,
 				 size_t sioc,
 				 struct kvec *siov,
 				 uint8_t rxhdr_flags,
-				 int alloc_flags,
+				 unsigned int __nocast alloc_flags,
 				 int dup_data,
 				 size_t *size_sent);
 
diff --git a/trunk/include/rxrpc/message.h b/trunk/include/rxrpc/message.h
index 3a59df6870b2..983d9f9eee1a 100644
--- a/trunk/include/rxrpc/message.h
+++ b/trunk/include/rxrpc/message.h
@@ -63,7 +63,7 @@ extern int rxrpc_conn_newmsg(struct rxrpc_connection *conn,
 			     uint8_t type,
 			     int count,
 			     struct kvec *diov,
-			     int alloc_flags,
+			     unsigned int __nocast alloc_flags,
 			     struct rxrpc_message **_msg);
 
 extern int rxrpc_conn_sendmsg(struct rxrpc_connection *conn, struct rxrpc_message *msg);
diff --git a/trunk/net/rxrpc/call.c b/trunk/net/rxrpc/call.c
index 5cfd4cadee42..86f777052633 100644
--- a/trunk/net/rxrpc/call.c
+++ b/trunk/net/rxrpc/call.c
@@ -1923,7 +1923,7 @@ int rxrpc_call_write_data(struct rxrpc_call *call,
 			  size_t sioc,
 			  struct kvec *siov,
 			  u8 rxhdr_flags,
-			  int alloc_flags,
+			  unsigned int __nocast alloc_flags,
 			  int dup_data,
 			  size_t *size_sent)
 {
diff --git a/trunk/net/rxrpc/connection.c b/trunk/net/rxrpc/connection.c
index 61463c74f8cc..be4b2be58956 100644
--- a/trunk/net/rxrpc/connection.c
+++ b/trunk/net/rxrpc/connection.c
@@ -522,7 +522,7 @@ int rxrpc_conn_newmsg(struct rxrpc_connection *conn,
 		      uint8_t type,
 		      int dcount,
 		      struct kvec diov[],
-		      int alloc_flags,
+		      unsigned int __nocast alloc_flags,
 		      struct rxrpc_message **_msg)
 {
 	struct rxrpc_message *msg;
diff --git a/trunk/net/sunrpc/sched.c b/trunk/net/sunrpc/sched.c
index f3104035e35d..ade730eaf401 100644
--- a/trunk/net/sunrpc/sched.c
+++ b/trunk/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;