[-mm patch] make net/core/skbuff.c:skb_over_panic() static

[-mm patch] make net/core/skbuff.c:skb_over_panic() static

[Adrian Bunk]

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);

Re: [-mm patch] make net/core/skbuff.c:skb_over_panic() static

[David Miller]

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.

Re: [-mm patch] make net/core/skbuff.c:skb_over_panic() static

[Andrew Morton]

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.

Re: [-mm patch] make net/core/skbuff.c:skb_over_panic() static

[David Miller]

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 :)

Re: [-mm patch] make net/core/skbuff.c:skb_over_panic() static

[David Miller]

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.