netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>, arjan@linux.intel.com
Cc: linux-kernel@vger.kernel.org, Ingo Molnar <mingo@elte.hu>,
	netdev@vger.kernel.org
Subject: [-mm patch] remove net/core/skbuff.c:skb_queue_lock_key
Date: Sat, 15 Jul 2006 02:35:19 +0200	[thread overview]
Message-ID: <20060715003519.GF3633@stusta.de> (raw)
In-Reply-To: <20060713224800.6cbdbf5d.akpm@osdl.org>

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.


  parent reply	other threads:[~2006-07-15  0:35 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20060713224800.6cbdbf5d.akpm@osdl.org>
2006-07-14  6:55 ` 2.6.18-rc1-mm2 Reuben Farrelly
2006-07-14  7:05   ` 2.6.18-rc1-mm2 Andrew Morton
2006-07-15  0:04     ` 2.6.18-rc1-mm2 Herbert Xu
2006-07-14  7:33   ` 2.6.18-rc1-mm2 David Miller
2006-07-14 18:48 ` 2.6.18-rc1-mm2: drivers/char/*synclink* compile errors Adrian Bunk
2006-07-14 21:31   ` David Miller
2006-07-15  0:35 ` Adrian Bunk [this message]
2006-07-15  5:35   ` [-mm patch] remove net/core/skbuff.c:skb_queue_lock_key Arjan van de Ven

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060715003519.GF3633@stusta.de \
    --to=bunk@stusta.de \
    --cc=akpm@osdl.org \
    --cc=arjan@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).