From: David S. Miller <davem@davemloft.net>
Date: Tue, 24 Feb 2009 11:50:29 +0000 (-0800)
Subject: Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e70049b9e74267dd47e1ffa62302073487afcb48;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
---

e70049b9e74267dd47e1ffa62302073487afcb48
diff --cc net/core/skbuff.c
index e5a8351ff12,c6a6b166f8d..33640d99c8e
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@@ -144,16 -142,7 +144,8 @@@ void skb_under_panic(struct sk_buff *sk
  	       skb->dev ? skb->dev->name : "<NULL>");
  	BUG();
  }
 +EXPORT_SYMBOL(skb_under_panic);
  
- void skb_truesize_bug(struct sk_buff *skb)
- {
- 	WARN(net_ratelimit(), KERN_ERR "SKB BUG: Invalid truesize (%u) "
- 	       "len=%u, sizeof(sk_buff)=%Zd\n",
- 	       skb->truesize, skb->len, sizeof(struct sk_buff));
- }
- EXPORT_SYMBOL(skb_truesize_bug);
- 
  /* 	Allocate a new skbuff. We do this ourselves so we can fill in a few
   *	'private' fields and also do memory statistics to find all the
   *	[BEEP] leaks.