diff --git a/[refs] b/[refs] index e5a5891ec341..edfa13a80a76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8203efb3c612743fecb1ed67cf1daf9d9c127462 +refs/heads/master: f52b5054ec108aaa9e903850d6b62af8ae3fe6ae diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c index 5ba03401b914..ced820318f94 100644 --- a/trunk/net/ipv4/udp.c +++ b/trunk/net/ipv4/udp.c @@ -1579,7 +1579,7 @@ static struct sock *udp_get_next(struct seq_file *seq, struct sock *sk) } while (sk && (!net_eq(sock_net(sk), net) || sk->sk_family != state->family)); if (!sk) { - spin_unlock(&state->udp_table->hash[state->bucket].lock); + spin_unlock_bh(&state->udp_table->hash[state->bucket].lock); return udp_get_first(seq, state->bucket + 1); } return sk;