diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
commit | dda93b45389f025fd3422d22cc31cc1ea6040305 (patch) | |
tree | 44a856744843e24ed1baf6ca4edb1be04809a606 /net/rxrpc/call_object.c | |
parent | 2e62024c265aa69315ed02835623740030435380 (diff) | |
parent | b61b8bba18fe2b63d38fdaf9b83de25e2d787dfe (diff) |
Merge branch 'x86/cache' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/rxrpc/call_object.c')
-rw-r--r-- | net/rxrpc/call_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c index 9486293fef5c..799f75b6900d 100644 --- a/net/rxrpc/call_object.c +++ b/net/rxrpc/call_object.c | |||
@@ -400,7 +400,7 @@ void rxrpc_incoming_call(struct rxrpc_sock *rx, | |||
400 | rcu_assign_pointer(conn->channels[chan].call, call); | 400 | rcu_assign_pointer(conn->channels[chan].call, call); |
401 | 401 | ||
402 | spin_lock(&conn->params.peer->lock); | 402 | spin_lock(&conn->params.peer->lock); |
403 | hlist_add_head(&call->error_link, &conn->params.peer->error_targets); | 403 | hlist_add_head_rcu(&call->error_link, &conn->params.peer->error_targets); |
404 | spin_unlock(&conn->params.peer->lock); | 404 | spin_unlock(&conn->params.peer->lock); |
405 | 405 | ||
406 | _net("CALL incoming %d on CONN %d", call->debug_id, call->conn->debug_id); | 406 | _net("CALL incoming %d on CONN %d", call->debug_id, call->conn->debug_id); |