diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-frv/uaccess.h | 2 | ||||
| -rw-r--r-- | include/linux/skbuff.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-frv/uaccess.h b/include/asm-frv/uaccess.h index 3d90e1018ee..53650c958f4 100644 --- a/include/asm-frv/uaccess.h +++ b/include/asm-frv/uaccess.h @@ -277,6 +277,8 @@ extern long __memcpy_user(void *dst, const void *src, unsigned long count); #endif +#define __clear_user clear_user + static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n) { diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 9391e4a4c34..ce256438e61 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1639,7 +1639,7 @@ static inline int skb_csum_unnecessary(const struct sk_buff *skb) * if skb->ip_summed is CHECKSUM_UNNECESSARY which indicates that the * hardware has already verified the correctness of the checksum. */ -static inline unsigned int skb_checksum_complete(struct sk_buff *skb) +static inline __sum16 skb_checksum_complete(struct sk_buff *skb) { return skb_csum_unnecessary(skb) ? 0 : __skb_checksum_complete(skb); |