diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 18:30:58 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 18:30:58 -0400 |
commit | 77501f3cb648e18733509a951ed31eddd7ef2c0b (patch) | |
tree | 82624caa354394df2422562bf6dda56a2c088704 /include/rxrpc/message.h | |
parent | 422fa08e538b649a9b80258950d2f8a202f45f19 (diff) | |
parent | 59a10b172fccaea793352c00fd9065f0a5b4ef70 (diff) | |
download | op-kernel-dev-77501f3cb648e18733509a951ed31eddd7ef2c0b.zip op-kernel-dev-77501f3cb648e18733509a951ed31eddd7ef2c0b.tar.gz |
Merge branch 'upstream'
Diffstat (limited to 'include/rxrpc/message.h')
-rw-r--r-- | include/rxrpc/message.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rxrpc/message.h b/include/rxrpc/message.h index 983d9f9..b318f27 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, - unsigned int __nocast alloc_flags, + gfp_t alloc_flags, struct rxrpc_message **_msg); extern int rxrpc_conn_sendmsg(struct rxrpc_connection *conn, struct rxrpc_message *msg); |