diff options
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/sock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index ee6cd2541d..32ff1c551d 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
@@ -1527,7 +1527,7 @@ void sock_init_data(struct socket *sock, struct sock *sk) | |||
1527 | atomic_set(&sk->sk_refcnt, 1); | 1527 | atomic_set(&sk->sk_refcnt, 1); |
1528 | } | 1528 | } |
1529 | 1529 | ||
1530 | void fastcall lock_sock(struct sock *sk) | 1530 | void fastcall lock_sock_nested(struct sock *sk, int subclass) |
1531 | { | 1531 | { |
1532 | might_sleep(); | 1532 | might_sleep(); |
1533 | spin_lock_bh(&sk->sk_lock.slock); | 1533 | spin_lock_bh(&sk->sk_lock.slock); |
@@ -1538,11 +1538,11 @@ void fastcall lock_sock(struct sock *sk) | |||
1538 | /* | 1538 | /* |
1539 | * The sk_lock has mutex_lock() semantics here: | 1539 | * The sk_lock has mutex_lock() semantics here: |
1540 | */ | 1540 | */ |
1541 | mutex_acquire(&sk->sk_lock.dep_map, 0, 0, _RET_IP_); | 1541 | mutex_acquire(&sk->sk_lock.dep_map, subclass, 0, _RET_IP_); |
1542 | local_bh_enable(); | 1542 | local_bh_enable(); |
1543 | } | 1543 | } |
1544 | 1544 | ||
1545 | EXPORT_SYMBOL(lock_sock); | 1545 | EXPORT_SYMBOL(lock_sock_nested); |
1546 | 1546 | ||
1547 | void fastcall release_sock(struct sock *sk) | 1547 | void fastcall release_sock(struct sock *sk) |
1548 | { | 1548 | { |