diff options
| author | Ingo Molnar <mingo@elte.hu> | 2006-07-03 03:25:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 18:27:08 -0400 |
| commit | c63661848581a9842dfc72d9a400285dd284fc47 (patch) | |
| tree | 83c8372a5289e14237eea64207886508866ee1a4 /net | |
| parent | a09785a2414afb261d9f719d544742af4300df22 (diff) | |
[PATCH] lockdep: annotate bh_lock_sock()
Teach special (recursive) locking code to the lock validator. Has no effect
on non-lockdep kernels.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 823717285c6d..5a886e6efbbe 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
| @@ -1090,7 +1090,7 @@ process: | |||
| 1090 | 1090 | ||
| 1091 | skb->dev = NULL; | 1091 | skb->dev = NULL; |
| 1092 | 1092 | ||
| 1093 | bh_lock_sock(sk); | 1093 | bh_lock_sock_nested(sk); |
| 1094 | ret = 0; | 1094 | ret = 0; |
| 1095 | if (!sock_owned_by_user(sk)) { | 1095 | if (!sock_owned_by_user(sk)) { |
| 1096 | #ifdef CONFIG_NET_DMA | 1096 | #ifdef CONFIG_NET_DMA |