* [-mm patch] make net/core/skbuff.c:skb_over_panic() static [not found] <20061114014125.dd315fff.akpm@osdl.org> @ 2006-11-17 17:02 ` Adrian Bunk 2006-11-21 0:55 ` David Miller 0 siblings, 1 reply; 5+ messages in thread From: Adrian Bunk @ 2006-11-17 17:02 UTC (permalink / raw) To: Andrew Morton; +Cc: linux-kernel, netdev skb_over_panic() can now become static. Signed-off-by: Adrian Bunk <bunk@stusta.de> --- Note: This patch depends on net-uninline-skb_put.patch. include/linux/skbuff.h | 2 -- net/core/skbuff.c | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) --- linux-2.6.19-rc5-mm2/include/linux/skbuff.h.old 2006-11-17 15:24:22.000000000 +0100 +++ linux-2.6.19-rc5-mm2/include/linux/skbuff.h 2006-11-17 15:24:31.000000000 +0100 @@ -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); --- linux-2.6.19-rc5-mm2/net/core/skbuff.c.old 2006-11-17 15:24:38.000000000 +0100 +++ linux-2.6.19-rc5-mm2/net/core/skbuff.c 2006-11-17 15:25:09.000000000 +0100 @@ -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", @@ -2094,7 +2094,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); ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [-mm patch] make net/core/skbuff.c:skb_over_panic() static 2006-11-17 17:02 ` [-mm patch] make net/core/skbuff.c:skb_over_panic() static Adrian Bunk @ 2006-11-21 0:55 ` David Miller 2006-11-21 1:37 ` Andrew Morton 2006-11-21 1:39 ` David Miller 0 siblings, 2 replies; 5+ messages in thread From: David Miller @ 2006-11-21 0:55 UTC (permalink / raw) To: bunk; +Cc: akpm, linux-kernel, netdev From: Adrian Bunk <bunk@stusta.de> Date: Fri, 17 Nov 2006 18:02:05 +0100 > skb_over_panic() can now become static. > > Signed-off-by: Adrian Bunk <bunk@stusta.de> Applied to net-2.6.20, thanks Adrian. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [-mm patch] make net/core/skbuff.c:skb_over_panic() static 2006-11-21 0:55 ` David Miller @ 2006-11-21 1:37 ` Andrew Morton 2006-11-21 1:40 ` David Miller 2006-11-21 1:39 ` David Miller 1 sibling, 1 reply; 5+ messages in thread From: Andrew Morton @ 2006-11-21 1:37 UTC (permalink / raw) To: David Miller; +Cc: bunk, linux-kernel, netdev On Mon, 20 Nov 2006 19:55:56 -0500 (EST) David Miller <davem@davemloft.net> wrote: > From: Adrian Bunk <bunk@stusta.de> > Date: Fri, 17 Nov 2006 18:02:05 +0100 > > > skb_over_panic() can now become static. > > > > Signed-off-by: Adrian Bunk <bunk@stusta.de> > > Applied to net-2.6.20, thanks Adrian. Adrian's patch is only applicable if my net-uninline-skb_put.patch is also applied. I'm not sure what to do with net-uninline-skb_put.patch. It's a good patch if all that deudgging stuff is present in skb_put(), but it's a bad patch if it isn't present. But it _is_ present. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [-mm patch] make net/core/skbuff.c:skb_over_panic() static 2006-11-21 1:37 ` Andrew Morton @ 2006-11-21 1:40 ` David Miller 0 siblings, 0 replies; 5+ messages in thread From: David Miller @ 2006-11-21 1:40 UTC (permalink / raw) To: akpm; +Cc: bunk, linux-kernel, netdev From: Andrew Morton <akpm@osdl.org> Date: Mon, 20 Nov 2006 17:37:16 -0800 > Adrian's patch is only applicable if my net-uninline-skb_put.patch is also > applied. I just realized that, see the email I just sent out. > I'm not sure what to do with net-uninline-skb_put.patch. It's a > good patch if all that deudgging stuff is present in skb_put(), but > it's a bad patch if it isn't present. But it _is_ present. Keep it in your tree if you want, it's never going into mine :) ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [-mm patch] make net/core/skbuff.c:skb_over_panic() static 2006-11-21 0:55 ` David Miller 2006-11-21 1:37 ` Andrew Morton @ 2006-11-21 1:39 ` David Miller 1 sibling, 0 replies; 5+ messages in thread From: David Miller @ 2006-11-21 1:39 UTC (permalink / raw) To: bunk; +Cc: akpm, linux-kernel, netdev From: David Miller <davem@davemloft.net> Date: Mon, 20 Nov 2006 19:55:56 -0500 (EST) > From: Adrian Bunk <bunk@stusta.de> > Date: Fri, 17 Nov 2006 18:02:05 +0100 > > > skb_over_panic() can now become static. > > > > Signed-off-by: Adrian Bunk <bunk@stusta.de> > > Applied to net-2.6.20, thanks Adrian. I just realized this requires a patch already in -mm which isn't in my tree. Sorry about that. I really doubt I'll put that skb_put() patch into my tree, ever, we can just remove the debugging checks or make them conditional to keep the inline. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2006-11-21 1:40 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20061114014125.dd315fff.akpm@osdl.org>
2006-11-17 17:02 ` [-mm patch] make net/core/skbuff.c:skb_over_panic() static Adrian Bunk
2006-11-21 0:55 ` David Miller
2006-11-21 1:37 ` Andrew Morton
2006-11-21 1:40 ` David Miller
2006-11-21 1:39 ` David Miller
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).