diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-13 21:22:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-13 21:22:27 -0400 |
| commit | 59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f (patch) | |
| tree | b337d73229a69e399d4e4f7128b33ce734660e35 /net/rxrpc/connection.c | |
| parent | 0d69ae5fb7eb9ba3b54cf0ba4ef5ae591f31eef7 (diff) | |
| parent | 046d20b73960b7a2474b6d5e920d54c3fd7c23fe (diff) | |
| download | op-kernel-dev-59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f.zip op-kernel-dev-59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'net/rxrpc/connection.c')
| -rw-r--r-- | net/rxrpc/connection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/connection.c b/net/rxrpc/connection.c index 61463c7..2ba14a7 100644 --- 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[], - int alloc_flags, + gfp_t alloc_flags, struct rxrpc_message **_msg) { struct rxrpc_message *msg; |
