Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Viro <viro@parcelfarce.linux.theplanet.co.uk>2005-02-10 03:07:55 -0800
committerDavid S. Miller <davem@nuts.davemloft.net>2005-02-10 03:07:55 -0800
commitee2cff8d03c9129511ba72407c27735a6a5b9f25 (patch)
tree62f609e5e59b878b45cddbdeca72a3975829df21
parent517a72df7ac337255eab126c7c47a2f065c656f6 (diff)
[SPARC]: __user annotations in sparc checksum.h
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/asm-sparc/checksum.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-sparc/checksum.h b/include/asm-sparc/checksum.h
index 5a03aab1dd18..286158108974 100644
--- a/include/asm-sparc/checksum.h
+++ b/include/asm-sparc/checksum.h
@@ -61,7 +61,7 @@ csum_partial_copy_nocheck (const unsigned char *src, unsigned char *dst, int len
}
static inline unsigned int
-csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst, int len,
+csum_partial_copy_from_user(const unsigned char __user *src, unsigned char *dst, int len,
unsigned int sum, int *err)
{
if (!access_ok (VERIFY_READ, src, len)) {
@@ -69,7 +69,7 @@ csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst, int le
memset (dst, 0, len);
return sum;
} else {
- register unsigned int ret asm("o0") = (unsigned int)src;
+ register unsigned long ret asm("o0") = (unsigned long)src;
register char *d asm("o1") = dst;
register int l asm("g1") = len;
register unsigned int s asm("g7") = sum;
@@ -98,8 +98,8 @@ csum_partial_copy_to_user(const unsigned char *src, unsigned char __user *dst, i
*err = -EFAULT;
return sum;
} else {
- register unsigned int ret asm("o0") = (unsigned int)src;
- register char *d asm("o1") = dst;
+ register unsigned long ret asm("o0") = (unsigned long)src;
+ register char __user *d asm("o1") = dst;
register int l asm("g1") = len;
register unsigned int s asm("g7") = sum;