diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2018-05-26 13:45:49 +0200 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2018-05-26 13:45:49 +0200 |
| commit | f33ecec9bb5199c5a4dd296af604f70273d2636e (patch) | |
| tree | ba12665fe8f7952a64013bef9125bfac27ff1fda /net/sunrpc/xprtrdma/xprt_rdma.h | |
| parent | 0ea3286e2df74c9ec2fadbf91170cd3edd14e3e5 (diff) | |
| parent | 2d2ccf24939cf369f7473c7e4ea309891be91848 (diff) | |
| download | blackbird-obmc-linux-f33ecec9bb5199c5a4dd296af604f70273d2636e.tar.gz blackbird-obmc-linux-f33ecec9bb5199c5a4dd296af604f70273d2636e.zip | |
Merge branch 'x86/hyperv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
To resolve conflicts with the PV TLB flush series.
Diffstat (limited to 'net/sunrpc/xprtrdma/xprt_rdma.h')
| -rw-r--r-- | net/sunrpc/xprtrdma/xprt_rdma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h index 3d3b423fa9c1..cb41b12a3bf8 100644 --- a/net/sunrpc/xprtrdma/xprt_rdma.h +++ b/net/sunrpc/xprtrdma/xprt_rdma.h @@ -380,7 +380,7 @@ rpcrdma_mr_pop(struct list_head *list) struct rpcrdma_mr *mr; mr = list_first_entry(list, struct rpcrdma_mr, mr_list); - list_del(&mr->mr_list); + list_del_init(&mr->mr_list); return mr; } |
