[-mm patch] remove net/core/skbuff.c:skb_queue_lock_key

Adrian Bunk
2006-07-15T00:35:25Z

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 <bunk@stusta.de>

---

include/linux/skbuff.h | 2 --
net/core/skbuff.c | 7 -------
2 files changed, 9 deletions(-)

--- linux-2.6.18-rc1-mm2-full/include/linux/skbuff.h.old 2006-07-14 22:15:15.000000000 +0200
+++ linux-2.6.18-rc1-mm2-full/include/linux/skbuff.h 2006-07-14 22:15:23.000000000 +0200
@@ -604,8 +604,6 @@
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
--- linux-2.6.18-rc1-mm2-full/net/core/skbuff.c.old 2006-07-14 22:15:30.000000000 +0200
+++ linux-2.6.18-rc1-mm2-full/net/core/skbuff.c 2006-07-14 22:15:38.000000000 +0200
@@ -71,13 +71,6 @@
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.