The patch titled make net/core/skbuff.c:skb_over_panic() static has been added to the -mm tree. Its filename is net-uninline-skb_put-fix.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: make net/core/skbuff.c:skb_over_panic() static From: Adrian Bunk <bunk@xxxxxxxxx> skb_over_panic() can now become static. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/linux/skbuff.h | 2 -- net/core/skbuff.c | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff -puN include/linux/skbuff.h~net-uninline-skb_put-fix include/linux/skbuff.h --- a/include/linux/skbuff.h~net-uninline-skb_put-fix +++ a/include/linux/skbuff.h @@ -364,8 +364,6 @@ extern struct sk_buff *skb_copy_expand(c gfp_t priority); extern int skb_pad(struct sk_buff *skb, int pad); #define dev_kfree_skb(a) kfree_skb(a) -extern void skb_over_panic(struct sk_buff *skb, int len, - void *here); extern void skb_under_panic(struct sk_buff *skb, int len, void *here); extern void skb_truesize_bug(struct sk_buff *skb); diff -puN net/core/skbuff.c~net-uninline-skb_put-fix net/core/skbuff.c --- a/net/core/skbuff.c~net-uninline-skb_put-fix +++ a/net/core/skbuff.c @@ -84,7 +84,7 @@ static kmem_cache_t *skbuff_fclone_cache * * Out of line support code for skb_put(). Not user callable. */ -void skb_over_panic(struct sk_buff *skb, int sz, void *here) +static void skb_over_panic(struct sk_buff *skb, int sz, void *here) { printk(KERN_EMERG "skb_over_panic: text:%p len:%d put:%d head:%p " "data:%p tail:%p end:%p dev:%s\n", @@ -2096,7 +2096,6 @@ EXPORT_SYMBOL(skb_copy_and_csum_bits); EXPORT_SYMBOL(skb_copy_and_csum_dev); EXPORT_SYMBOL(skb_copy_bits); EXPORT_SYMBOL(skb_copy_expand); -EXPORT_SYMBOL(skb_over_panic); EXPORT_SYMBOL(skb_pad); EXPORT_SYMBOL(skb_realloc_headroom); EXPORT_SYMBOL(skb_under_panic); _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch make-drivers-acpi-baycdrive_bays-static.patch git-alsa.patch tidy-gregkh-driver-udev-compatible-hack.patch drivers-media-video-cafe_ccicc-make-a-function-static.patch git-gfs2-nmw.patch git-mtd.patch git-net.patch net-uninline-skb_put-fix.patch git-pcmcia.patch git-scsi-misc.patch drivers-scsi-small-cleanups.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-advansysc-cleanups.patch megaraid-fix-warnings-when-config_proc_fs=n.patch drivers-scsi-dpt_i2oc-remove-dead-code.patch acx1xx-wireless-driver.patch drivers-edac-make-code-static.patch ext4_ext_split-remove-dead-code.patch the-scheduled-removal-of-some-oss-options.patch fs-reiser4-possible-cleanups.patch reiser4-possible-cleanups-2.patch gtod-persistent-clock-support-i386-i386-unexport-read_persistent_clock.patch updated-i386-convert-to-clock-event-devices-arch-i386-kernel-apicc-make-a-function-static.patch updated-i386-convert-to-clock-event-devices-remove-arch-i386-kernel-time_hpetchpet_reenable.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