aboutsummaryrefslogtreecommitdiff
path: root/include/rxrpc/call.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-06 14:16:19 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-06 14:16:19 -0700
commit9aec247d3b213f3c29cfba921cf11deb1ed513cd (patch)
tree6ce8272654896b4d0e05b1c82b8d7d3292284676 /include/rxrpc/call.h
parentdce32c781b1c026863a254fe8123dd78c59ad984 (diff)
parent3a867b36c3234673e61f883ebc11ad18f80a176f (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/rxrpc/call.h')
-rw-r--r--include/rxrpc/call.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rxrpc/call.h b/include/rxrpc/call.h
index f48f27e9e0a..8118731e7d9 100644
--- a/include/rxrpc/call.h
+++ b/include/rxrpc/call.h
@@ -203,7 +203,7 @@ extern int rxrpc_call_write_data(struct rxrpc_call *call,
size_t sioc,
struct kvec *siov,
uint8_t rxhdr_flags,
- int alloc_flags,
+ unsigned int __nocast alloc_flags,
int dup_data,
size_t *size_sent);