Merge branch 'upstream'

[powerpc.git] / net / rxrpc / connection.c

diff --git a/net/rxrpc/connection.c b/net/rxrpc/connection.c
index be4b2be..2ba14a7 100644 (file)
--- a/net/rxrpc/connection.c
+++ b/net/rxrpc/connection.c
@@ -522,7 +522,7 @@ int rxrpc_conn_newmsg(struct rxrpc_connection *conn,
                      uint8_t type,
                      int dcount,
                      struct kvec diov[],
-                     unsigned int __nocast alloc_flags,
+                     gfp_t alloc_flags,
                      struct rxrpc_message **_msg)
 {
        struct rxrpc_message *msg;