Merge branch 'master' of /usr/src/ntfs-2.6/

[linux-2.6] / net / rxrpc / connection.c

diff --git a/net/rxrpc/connection.c b/net/rxrpc/connection.c
index be4b2be58956a775c16a669c0a4af5c07f8aafaa..2ba14a75dbbeb94c37d196b4501bbe6025c1ac69 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;