patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / x86_64 / lib / csum-wrappers.c

diff --git a/arch/x86_64/lib/csum-wrappers.c b/arch/x86_64/lib/csum-wrappers.c
index b89aca4..a8e4c18 100644 (file)
--- a/arch/x86_64/lib/csum-wrappers.c
+++ b/arch/x86_64/lib/csum-wrappers.c
@@ -19,7 +19,7 @@
  * src and dst are best aligned to 64bits. 
  */ 
 unsigned int 
-csum_partial_copy_from_user(const char *src, char *dst, 
+csum_partial_copy_from_user(const char __user *src, char *dst, 
                            int len, unsigned int isum, int *errp)
 { 
        *errp = 0;
@@ -33,7 +33,7 @@ csum_partial_copy_from_user(const char *src, char *dst,
                if (unlikely((unsigned long)src & 6)) {                 
                        while (((unsigned long)src & 6) && len >= 2) { 
                                __u16 val16;                    
-                               *errp = __get_user(val16, (__u16 *)src); 
+                               *errp = __get_user(val16, (__u16 __user *)src); 
                                if (*errp)
                                        return isum;
                                *(__u16 *)dst = val16;
@@ -43,7 +43,7 @@ csum_partial_copy_from_user(const char *src, char *dst,
                                len -= 2;
                        }
                }
-               isum = csum_partial_copy_generic(src,dst,len,isum,errp,NULL);
+               isum = csum_partial_copy_generic((void *)src,dst,len,isum,errp,NULL);
                if (likely(*errp == 0)) 
                        return isum;
        } 
@@ -66,7 +66,7 @@ EXPORT_SYMBOL(csum_partial_copy_from_user);
  * src and dst are best aligned to 64bits.
  */ 
 unsigned int 
-csum_partial_copy_to_user(const char *src, char *dst, 
+csum_partial_copy_to_user(const char *src, char __user *dst, 
                          int len, unsigned int isum, int *errp)
 { 
        if (unlikely(!access_ok(VERIFY_WRITE, dst, len))) {
@@ -78,7 +78,7 @@ csum_partial_copy_to_user(const char *src, char *dst,
                while (((unsigned long)dst & 6) && len >= 2) { 
                        __u16 val16 = *(__u16 *)src;
                        isum = add32_with_carry(isum, val16);
-                       *errp = __put_user(val16, (__u16 *)dst);
+                       *errp = __put_user(val16, (__u16 __user *)dst);
                        if (*errp)
                                return isum;
                        src += 2; 
@@ -88,7 +88,7 @@ csum_partial_copy_to_user(const char *src, char *dst,
        }
 
        *errp = 0;
-       return csum_partial_copy_generic(src,dst,len,isum,NULL,errp); 
+       return csum_partial_copy_generic(src, (void *)dst,len,isum,NULL,errp); 
 } 
 
 EXPORT_SYMBOL(csum_partial_copy_to_user);