The patch titled
remove net/core/skbuff.c:skb_queue_lock_key
has been added to the -mm tree. Its filename is
lockdep-split-the-skb_queue_head_init-lock-class-tidy.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: remove net/core/skbuff.c:skb_queue_lock_key
From: Adrian Bunk <bunk@xxxxxxxxx>
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@xxxxxxxxx>
Acked-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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.
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
git-cpufreq.patch
git-dvb.patch
git-gfs2.patch
if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch
make-variables-static-after-klibc-merge.patch
git-libata-all.patch
git-mtd.patch
drivers-net-e1000-possible-cleanups.patch
lockdep-split-the-skb_queue_head_init-lock-class-tidy.patch
fs-nfs-make-2-functions-static.patch
fs-nfs-make-code-static.patch
git-ocfs2.patch
git-pcmcia.patch
include-scsi-libsash-should-include-linux-scatterlisth.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
drivers-scsi-advansysc-cleanups.patch
make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
areca-raid-linux-scsi-driver.patch
git-cryptodev.patch
mm-make-functions-static.patch
acx1xx-wireless-driver.patch
drivers-edac-make-code-static.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix.patch
reiserfs-warn-about-the-useless-nolargeio-option.patch
x86-microcode-add-sysfs-and-hotplug-support-fix-fix-2.patch
task-watchers-register-semundo-task-watcher.patch
fs-ecryptfs-possible-cleanups.patch
ecryptfs-add-a-maintainers-entry.patch
make-kernel-sysctlc_proc_do_string-static.patch
namespaces-utsname-sysctl-hack-fix.patch
namespaces-utsname-implement-clone_newuts-flag.patch
fs-reiser4-possible-cleanups.patch
srcu-3-add-srcu-operations-to-rcutorture-fix.patch
the-scheduled-removal-of-some-oss-drivers.patch
the-scheduled-removal-of-some-oss-drivers-fix.patch
the-scheduled-removal-of-some-oss-drivers-fix-fix.patch
kill-sound-oss-_symsc.patch
slab-cache-shrinker-statistics.patch
debug-shared-irqs-kconfig-fix.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
