---

yaml --- r: 9667 b: refs/heads/master c: dd13a28 h: refs/heads/master i: 9665: cbea125 9663: da7b33b v: v3
git-mirror · Oct 5, 2005 · b643c28 · b643c28
1 parent 03a81c3
commit b643c28
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;