Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/arch/mips/lib/csum_partial_copy.c b/arch/mips/lib/csum_partial_copy.c
index 0d6dce9..6e9f366 100644 (file)
--- a/arch/mips/lib/csum_partial_copy.c
+++ b/arch/mips/lib/csum_partial_copy.c
@@ -6,17 +6,18 @@
  * Copyright (C) 1994, 1995 Waldorf Electronics GmbH
  * Copyright (C) 1998, 1999 Ralf Baechle
  */
-#include <net/checksum.h>
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <asm/byteorder.h>
 #include <asm/string.h>
 #include <asm/uaccess.h>
+#include <net/checksum.h>
 
 /*
  * copy while checksumming, otherwise like csum_partial
  */
-unsigned int csum_partial_copy_nocheck(const char *src, char *dst,
-       int len, unsigned int sum)
+unsigned int csum_partial_copy_nocheck(const unsigned char *src,
+       unsigned char *dst, int len, unsigned int sum)
 {
        /*
         * It's 2:30 am and I don't feel like doing it real ...
@@ -32,11 +33,12 @@ unsigned int csum_partial_copy_nocheck(const char *src, char *dst,
  * Copy from userspace and compute checksum.  If we catch an exception
  * then zero the rest of the buffer.
  */
-unsigned int csum_partial_copy_from_user (const char *src, char *dst,
-       int len, unsigned int sum, int *err_ptr)
+unsigned int csum_partial_copy_from_user (const unsigned char __user *src,
+       unsigned char *dst, int len, unsigned int sum, int *err_ptr)
 {
        int missing;
 
+       might_sleep();
        missing = copy_from_user(dst, src, len);
        if (missing) {
                memset(dst + len - missing, 0, missing);