Merge to Fedora kernel-2.6.7-1.441

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

diff --git a/include/asm-i386/checksum.h b/include/asm-i386/checksum.h
index 59fe7fc..2d434cc 100644 (file)
--- a/include/asm-i386/checksum.h
+++ b/include/asm-i386/checksum.h
@@ -177,8 +177,10 @@ 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 direct_csum_and_copy_to_user(const char *src, char *dst,
-                                   int len, int sum, int *err_ptr)
+static __inline__ unsigned int direct_csum_and_copy_to_user(const char *src, 
+                                                    char __user *dst,
+                                                    int len, int sum, 
+                                                    int *err_ptr)
 {
        if (access_ok(VERIFY_WRITE, dst, len))
                return direct_csum_partial_copy_generic(src, dst, len, sum, NULL, err_ptr);
@@ -189,7 +191,7 @@ static __inline__ unsigned int direct_csum_and_copy_to_user(const char *src, cha
        return -1; /* invalid checksum */
 }
 
-static __inline__ unsigned int csum_and_copy_to_user(const char *src, char *dst,
+static __inline__ unsigned int csum_and_copy_to_user(const char *src, char __user *dst,
                                    int len, int sum, int *err_ptr)
 {
        if (access_ok(VERIFY_WRITE, dst, len)) {