From: Adrian Bunk On Thu, Jul 13, 2006 at 10:48:00PM -0700, Andrew Morton wrote: >... > Changes since 2.6.18-rc1-mm1: >... > +lockdep-split-the-skb_queue_head_init-lock-class.patch > > lockdep-versus-net fix. >... skb_queue_lock_key is no longer used. Signed-off-by: Adrian Bunk Acked-by: Arjan van de Ven Signed-off-by: Andrew Morton --- include/linux/skbuff.h | 2 -- net/core/skbuff.c | 7 ------- 2 files changed, 9 deletions(-) diff -puN include/linux/skbuff.h~lockdep-split-the-skb_queue_head_init-lock-class-tidy include/linux/skbuff.h --- a/include/linux/skbuff.h~lockdep-split-the-skb_queue_head_init-lock-class-tidy +++ a/include/linux/skbuff.h @@ -604,8 +604,6 @@ static inline __u32 skb_queue_len(const return list_->qlen; } -extern struct lock_class_key skb_queue_lock_key; - /* * This function creates a split out lock class for each invocation; * this is needed for now since a whole lot of users of the skb-queue diff -puN net/core/skbuff.c~lockdep-split-the-skb_queue_head_init-lock-class-tidy net/core/skbuff.c --- a/net/core/skbuff.c~lockdep-split-the-skb_queue_head_init-lock-class-tidy +++ a/net/core/skbuff.c @@ -71,13 +71,6 @@ static kmem_cache_t *skbuff_head_cache _ static kmem_cache_t *skbuff_fclone_cache __read_mostly; /* - * lockdep: lock class key used by skb_queue_head_init(): - */ -struct lock_class_key skb_queue_lock_key; - -EXPORT_SYMBOL(skb_queue_lock_key); - -/* * Keep out-of-line to prevent kernel bloat. * __builtin_return_address is not used because it is not always * reliable. _