diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-06 14:16:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-06 14:16:19 -0700 |
| commit | 9aec247d3b213f3c29cfba921cf11deb1ed513cd (patch) | |
| tree | 6ce8272654896b4d0e05b1c82b8d7d3292284676 /include/rxrpc | |
| parent | dce32c781b1c026863a254fe8123dd78c59ad984 (diff) | |
| parent | 3a867b36c3234673e61f883ebc11ad18f80a176f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/rxrpc')
| -rw-r--r-- | include/rxrpc/call.h | 2 | ||||
| -rw-r--r-- | include/rxrpc/message.h | 2 |
2 files changed, 2 insertions, 2 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); diff --git a/include/rxrpc/message.h b/include/rxrpc/message.h index 3a59df6870b..983d9f9eee1 100644 --- a/include/rxrpc/message.h +++ b/include/rxrpc/message.h @@ -63,7 +63,7 @@ extern int rxrpc_conn_newmsg(struct rxrpc_connection *conn, uint8_t type, int count, struct kvec *diov, - int alloc_flags, + unsigned int __nocast alloc_flags, struct rxrpc_message **_msg); extern int rxrpc_conn_sendmsg(struct rxrpc_connection *conn, struct rxrpc_message *msg); |