diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-11 09:29:48 +0100 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-11 09:29:48 +0100 |
commit | 29d8699ebb1e8948a612306c69e6d9c4ef23342f (patch) | |
tree | f2378e8d2fbef7fc215a25acf2042b8965109e5e /net/rxrpc/call.c | |
parent | e9438250b635f7832e99a8c8d2e394dd1522ce65 (diff) | |
parent | 907a42617970a159361f17ef9a63f04d276995ab (diff) | |
download | op-kernel-dev-29d8699ebb1e8948a612306c69e6d9c4ef23342f.zip op-kernel-dev-29d8699ebb1e8948a612306c69e6d9c4ef23342f.tar.gz |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'net/rxrpc/call.c')
-rw-r--r-- | net/rxrpc/call.c | 2 |
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) { |