aboutsummaryrefslogtreecommitdiffstats
path: root/net/rxrpc/call.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-13 21:22:27 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-13 21:22:27 -0400
commit59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f (patch)
treeb337d73229a69e399d4e4f7128b33ce734660e35 /net/rxrpc/call.c
parent0d69ae5fb7eb9ba3b54cf0ba4ef5ae591f31eef7 (diff)
parent046d20b73960b7a2474b6d5e920d54c3fd7c23fe (diff)
downloadkernel_samsung_tuna-59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f.zip
kernel_samsung_tuna-59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f.tar.gz
kernel_samsung_tuna-59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f.tar.bz2
Merge branch 'master'
Diffstat (limited to 'net/rxrpc/call.c')
-rw-r--r--net/rxrpc/call.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/call.c b/net/rxrpc/call.c
index 5cfd4ca..c4aeb7d 100644
--- a/net/rxrpc/call.c
+++ b/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,
+ gfp_t alloc_flags,
int dup_data,
size_t *size_sent)
{