From f29f05a37e3c1ff9d8e9e1898851e8255bf12a8c Mon Sep 17 00:00:00 2001
From: Victor Fusco <victor@cetuc.puc-rio.br>
Date: Mon, 18 Jul 2005 13:36:38 -0700
Subject: [PATCH] --- yaml --- r: 4906 b: refs/heads/master c:
 e2bf521d9728bfae9b6c3d484614e5962d0b5afd h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/skbuff.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dd227462016a..a603f5bbc53b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37da647d994cdac7e0bc8d2a365fbda403939a2b
+refs/heads/master: e2bf521d9728bfae9b6c3d484614e5962d0b5afd
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index 5d4a990d5577..0061c9470482 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -502,7 +502,8 @@ static inline struct sk_buff *skb_share_check(struct sk_buff *skb,
  *
  *	%NULL is returned on a memory allocation failure.
  */
-static inline struct sk_buff *skb_unshare(struct sk_buff *skb, int pri)
+static inline struct sk_buff *skb_unshare(struct sk_buff *skb,
+					  unsigned int __nocast pri)
 {
 	might_sleep_if(pri & __GFP_WAIT);
 	if (skb_cloned(skb)) {