From 0da6d9fc0ad31b00d9e29b1559ccd18e1fd9c393 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 17 Oct 2008 15:55:07 +0200 Subject: [PATCH] --- yaml --- r: 123178 b: refs/heads/master c: e25cf3db560e803292946ef23a30c69e341ce56f h: refs/heads/master 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 065d1e051e2b..96fd06b4c97e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 708b8eae0fd532af73ea8350e6dcc10255ff7376 +refs/heads/master: e25cf3db560e803292946ef23a30c69e341ce56f diff --git a/trunk/include/linux/lockdep.h b/trunk/include/linux/lockdep.h index fc9f8e88123b..8956daf64abd 100644 --- a/trunk/include/linux/lockdep.h +++ b/trunk/include/linux/lockdep.h @@ -336,10 +336,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,