patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / alpha / lib / csum_partial_copy.c

diff --git a/arch/alpha/lib/csum_partial_copy.c b/arch/alpha/lib/csum_partial_copy.c
index 702efb6..3e0da49 100644 (file)
--- a/arch/alpha/lib/csum_partial_copy.c
+++ b/arch/alpha/lib/csum_partial_copy.c
@@ -99,7 +99,7 @@ static inline unsigned short from64to16(unsigned long x)
  * Ok. This isn't fun, but this is the EASY case.
  */
 static inline unsigned long
-csum_partial_cfu_aligned(const unsigned long *src, unsigned long *dst,
+csum_partial_cfu_aligned(const unsigned long __user *src, unsigned long *dst,
                         long len, unsigned long checksum,
                         int *errp)
 {
@@ -139,7 +139,8 @@ csum_partial_cfu_aligned(const unsigned long *src, unsigned long *dst,
  * easy.
  */
 static inline unsigned long
-csum_partial_cfu_dest_aligned(const unsigned long *src, unsigned long *dst,
+csum_partial_cfu_dest_aligned(const unsigned long __user *src,
+                             unsigned long *dst,
                              unsigned long soff,
                              long len, unsigned long checksum,
                              int *errp)
@@ -327,7 +328,7 @@ csum_partial_cfu_unaligned(const unsigned long * src, unsigned long * dst,
 }
 
 static unsigned int
-do_csum_partial_copy_from_user(const char *src, char *dst, int len,
+do_csum_partial_copy_from_user(const char __user *src, char *dst, int len,
                               unsigned int sum, int *errp)
 {
        unsigned long checksum = (unsigned) sum;
@@ -338,12 +339,12 @@ do_csum_partial_copy_from_user(const char *src, char *dst, int len,
                if (!doff) {
                        if (!soff)
                                checksum = csum_partial_cfu_aligned(
-                                       (const unsigned long *) src,
+                                       (const unsigned long __user *) src,
                                        (unsigned long *) dst,
                                        len-8, checksum, errp);
                        else
                                checksum = csum_partial_cfu_dest_aligned(
-                                       (const unsigned long *) src,
+                                       (const unsigned long __user *) src,
                                        (unsigned long *) dst,
                                        soff, len-8, checksum, errp);
                } else {
@@ -351,13 +352,13 @@ do_csum_partial_copy_from_user(const char *src, char *dst, int len,
                        ldq_u(partial_dest, dst);
                        if (!soff)
                                checksum = csum_partial_cfu_src_aligned(
-                                       (const unsigned long *) src,
+                                       (const unsigned long __user *) src,
                                        (unsigned long *) dst,
                                        doff, len-8, checksum,
                                        partial_dest, errp);
                        else
                                checksum = csum_partial_cfu_unaligned(
-                                       (const unsigned long *) src,
+                                       (const unsigned long __user *) src,
                                        (unsigned long *) dst,
                                        soff, doff, len-8, checksum,
                                        partial_dest, errp);
@@ -368,7 +369,7 @@ do_csum_partial_copy_from_user(const char *src, char *dst, int len,
 }
 
 unsigned int
-csum_partial_copy_from_user(const char *src, char *dst, int len,
+csum_partial_copy_from_user(const char __user *src, char *dst, int len,
                            unsigned int sum, int *errp)
 {
        if (!access_ok(src, len, VERIFY_READ)) {