diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:23:23 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:23:23 -0500 |
| commit | 1ccedb7cdba6886939dd8b4c8f965a826f696e56 (patch) | |
| tree | 0f5fc519a68faca5318c296315c9b6c502907056 /include/net/sock.h | |
| parent | a98f8fd24fb24fcb9a359553e64dd6aac5cf4279 (diff) | |
| parent | 929096fe9ff1f4b3645cf3919527ab47e8d5e17c (diff) | |
Merge commit 'v2.6.28-rc9' into x86/apic
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index c04f9e18ea22..2f47107f6d0f 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -815,7 +815,7 @@ static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb) | |||
| 815 | */ | 815 | */ |
| 816 | #define sock_lock_init_class_and_name(sk, sname, skey, name, key) \ | 816 | #define sock_lock_init_class_and_name(sk, sname, skey, name, key) \ |
| 817 | do { \ | 817 | do { \ |
| 818 | sk->sk_lock.owned = 0; \ | 818 | sk->sk_lock.owned = 0; \ |
| 819 | init_waitqueue_head(&sk->sk_lock.wq); \ | 819 | init_waitqueue_head(&sk->sk_lock.wq); \ |
| 820 | spin_lock_init(&(sk)->sk_lock.slock); \ | 820 | spin_lock_init(&(sk)->sk_lock.slock); \ |
| 821 | debug_check_no_locks_freed((void *)&(sk)->sk_lock, \ | 821 | debug_check_no_locks_freed((void *)&(sk)->sk_lock, \ |