vserver 1.9.5.x5

[linux-2.6.git] / include / asm-i386 / checksum.h

diff --git a/include/asm-i386/checksum.h b/include/asm-i386/checksum.h
index def093b..d76a5f0 100644 (file)
--- a/include/asm-i386/checksum.h
+++ b/include/asm-i386/checksum.h
@@ -25,8 +25,8 @@ asmlinkage unsigned int csum_partial(const unsigned char * buff, int len, unsign
  * better 64-bit) boundary
  */
 
-asmlinkage unsigned int csum_partial_copy_generic( const char *src, char *dst, int len, int sum,
-                                                  int *src_err_ptr, int *dst_err_ptr);
+asmlinkage unsigned int csum_partial_copy_generic(const unsigned char *src, unsigned char *dst,
+                                                 int len, int sum, int *src_err_ptr, int *dst_err_ptr);
 
 /*
  *     Note: when you get a NULL pointer exception here this means someone
@@ -36,18 +36,18 @@ asmlinkage unsigned int csum_partial_copy_generic( const char *src, char *dst, i
  *     verify_area().
  */
 static __inline__
-unsigned int csum_partial_copy_nocheck ( const char *src, char *dst,
+unsigned int csum_partial_copy_nocheck (const unsigned char *src, unsigned char *dst,
                                        int len, int sum)
 {
        return csum_partial_copy_generic ( src, dst, len, sum, NULL, NULL);
 }
 
 static __inline__
-unsigned int csum_partial_copy_from_user(const char __user *src, char *dst,
+unsigned int csum_partial_copy_from_user(const unsigned char __user *src, unsigned char *dst,
                                                int len, int sum, int *err_ptr)
 {
        might_sleep();
-       return csum_partial_copy_generic((__force char *)src, dst,
+       return csum_partial_copy_generic((__force unsigned char *)src, dst,
                                        len, sum, err_ptr, NULL);
 }
 
@@ -174,14 +174,14 @@ static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
  *     Copy and checksum to user
  */
 #define HAVE_CSUM_COPY_USER
-static __inline__ unsigned int csum_and_copy_to_user(const char *src, 
-                                                    char __user *dst,
+static __inline__ unsigned int csum_and_copy_to_user(const unsigned char *src,
+                                                    unsigned char __user *dst,
                                                     int len, int sum, 
                                                     int *err_ptr)
 {
        might_sleep();
        if (access_ok(VERIFY_WRITE, dst, len))
-               return csum_partial_copy_generic(src, (__force char *)dst, len, sum, NULL, err_ptr);
+               return csum_partial_copy_generic(src, (__force unsigned char *)dst, len, sum, NULL, err_ptr);
 
        if (len)
                *err_ptr = -EFAULT;