diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-22 16:33:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-22 16:33:00 -0700 |
| commit | 38afd6adf6bccd7176e88c07cac104d3639aa30d (patch) | |
| tree | 2142409984b609e51ef60b6a14318dd4e878718a /include/linux/skbuff.h | |
| parent | 8ed1383fb7b6685968588141d5934e0e6715e954 (diff) | |
| parent | 261688d01ec07d3a265b8ace6ec68310fbd96a96 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 5d4a990d557..0061c947048 100644 --- a/include/linux/skbuff.h +++ b/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)) { |