From e7aef13030ef4ab9e81fb7de7d6c049cba3ce483 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 12 Nov 2008 01:38:36 +0000 Subject: [PATCH] --- yaml --- r: 119075 b: refs/heads/master c: e8f6fbf62de37cbc2e179176ac7010d5f4396b67 h: refs/heads/master i: 119073: 222e8cdac783351444db105429fdc3a986a60a14 119071: 54411f9f0f9e294c77d07baccab0d1122066d501 v: v3 --- [refs] | 2 +- trunk/include/linux/lockdep.h | 5 +++-- trunk/include/net/sock.h | 2 +- trunk/net/core/sock.c | 2 -- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b6a8d72f66da..aabc2865b983 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1fa989e80a9a104bf3b81842a5f4c1867d7aa9c4 +refs/heads/master: e8f6fbf62de37cbc2e179176ac7010d5f4396b67 diff --git a/trunk/include/linux/lockdep.h b/trunk/include/linux/lockdep.h index 331e5f1c2d8e..29aec6e10020 100644 --- a/trunk/include/linux/lockdep.h +++ b/trunk/include/linux/lockdep.h @@ -331,10 +331,11 @@ static inline void lockdep_on(void) # define lock_set_subclass(l, s, i) do { } while (0) # define lockdep_init() do { } while (0) # define lockdep_info() do { } while (0) -# define lockdep_init_map(lock, name, key, sub) do { (void)(key); } while (0) +# define lockdep_init_map(lock, name, key, sub) \ + do { (void)(name); (void)(key); } while (0) # define lockdep_set_class(lock, key) do { (void)(key); } while (0) # define lockdep_set_class_and_name(lock, key, name) \ - do { (void)(key); } while (0) + do { (void)(key); (void)(name); } while (0) #define lockdep_set_class_and_subclass(lock, key, sub) \ do { (void)(key); } while (0) #define lockdep_set_subclass(lock, sub) do { } while (0) diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h index c04f9e18ea22..2f47107f6d0f 100644 --- a/trunk/include/net/sock.h +++ b/trunk/include/net/sock.h @@ -815,7 +815,7 @@ static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb) */ #define sock_lock_init_class_and_name(sk, sname, skey, name, key) \ do { \ - sk->sk_lock.owned = 0; \ + sk->sk_lock.owned = 0; \ init_waitqueue_head(&sk->sk_lock.wq); \ spin_lock_init(&(sk)->sk_lock.slock); \ debug_check_no_locks_freed((void *)&(sk)->sk_lock, \ diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index 5e2a3132a8c9..341e39456952 100644 --- a/trunk/net/core/sock.c +++ b/trunk/net/core/sock.c @@ -136,7 +136,6 @@ static struct lock_class_key af_family_keys[AF_MAX]; static struct lock_class_key af_family_slock_keys[AF_MAX]; -#ifdef CONFIG_DEBUG_LOCK_ALLOC /* * Make lock validator output more readable. (we pre-construct these * strings build-time, so that runtime initialization of socket @@ -187,7 +186,6 @@ static const char *af_family_clock_key_strings[AF_MAX+1] = { "clock-AF_RXRPC" , "clock-AF_ISDN" , "clock-AF_PHONET" , "clock-AF_MAX" }; -#endif /* * sk_callback_lock locking rules are per-address-family,