2 files changed, 20 insertions, 18 deletions

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 01a11b0c0291..1baf4d43bb2d 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -902,6 +902,7 @@ static inline unsigned char *__skb_put(struct sk_buff *skb, unsigned int len)
         return tmp;
 }
 
+extern unsigned char *skb_push(struct sk_buff *skb, unsigned int len);
 static inline unsigned char *__skb_push(struct sk_buff *skb, unsigned int len)
 {
         skb->data -= len;
@@ -909,24 +910,6 @@ static inline unsigned char *__skb_push(struct sk_buff *skb, unsigned int len)
         return skb->data;
 }
 
-/**
- *      skb_push - add data to the start of a buffer
- *      @skb: buffer to use
- *      @len: amount of data to add
- *
- *      This function extends the used data area of the buffer at the buffer
- *      start. If this would exceed the total buffer headroom the kernel will
- *      panic. A pointer to the first byte of the extra data is returned.
- */
-static inline unsigned char *skb_push(struct sk_buff *skb, unsigned int len)
-{
-        skb->data -= len;
-        skb->len  += len;
-        if (unlikely(skb->data<skb->head))
-                skb_under_panic(skb, len, current_text_addr());
-        return skb->data;
-}
-
 extern unsigned char *skb_pull(struct sk_buff *skb, unsigned int len);
 static inline unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len)
 {
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 0daf5c0e5b8d..a37127b5899c 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -897,6 +897,25 @@ unsigned char *skb_put(struct sk_buff *skb, unsigned int len)
 EXPORT_SYMBOL(skb_put);
 
 /**
+ *      skb_push - add data to the start of a buffer
+ *      @skb: buffer to use
+ *      @len: amount of data to add
+ *
+ *      This function extends the used data area of the buffer at the buffer
+ *      start. If this would exceed the total buffer headroom the kernel will
+ *      panic. A pointer to the first byte of the extra data is returned.
+ */
+unsigned char *skb_push(struct sk_buff *skb, unsigned int len)
+{
+        skb->data -= len;
+        skb->len  += len;
+        if (unlikely(skb->data<skb->head))
+                skb_under_panic(skb, len, __builtin_return_address(0));
+        return skb->data;
+}
+EXPORT_SYMBOL(skb_push);
+
+/**
  *      skb_pull - remove data from the start of a buffer
  *      @skb: buffer to use
  *      @len: amount of data to remove