diff --git a/[refs] b/[refs] index 470cd34f631c..e7d356f75449 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76f10ad0e67cbc6ded2ee143e5188e0b7ff9fb15 +refs/heads/master: 2b7e24b66d31d677d76b49918e711eb360c978b6 diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index b22d4a6083bd..19c96d498e20 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -604,8 +604,6 @@ static inline __u32 skb_queue_len(const struct sk_buff_head *list_) 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 --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c index 71487b915d67..022d8894c11d 100644 --- a/trunk/net/core/skbuff.c +++ b/trunk/net/core/skbuff.c @@ -70,13 +70,6 @@ static kmem_cache_t *skbuff_head_cache __read_mostly; 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