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 /net/rxrpc/connection.c | |
| parent | 422fa08e538b649a9b80258950d2f8a202f45f19 (diff) | |
| parent | 59a10b172fccaea793352c00fd9065f0a5b4ef70 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'net/rxrpc/connection.c')
| -rw-r--r-- | net/rxrpc/connection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/connection.c b/net/rxrpc/connection.c index be4b2be58956..2ba14a75dbbe 100644 --- a/net/rxrpc/connection.c +++ b/net/rxrpc/connection.c | |||
| @@ -522,7 +522,7 @@ int rxrpc_conn_newmsg(struct rxrpc_connection *conn, | |||
| 522 | uint8_t type, | 522 | uint8_t type, |
| 523 | int dcount, | 523 | int dcount, |
| 524 | struct kvec diov[], | 524 | struct kvec diov[], |
| 525 | unsigned int __nocast alloc_flags, | 525 | gfp_t alloc_flags, |
| 526 | struct rxrpc_message **_msg) | 526 | struct rxrpc_message **_msg) |
| 527 | { | 527 | { |
| 528 | struct rxrpc_message *msg; | 528 | struct rxrpc_message *msg; |