vserver 1.9.3

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

diff --git a/include/asm-i386/checksum.h b/include/asm-i386/checksum.h
index 96e4b2d..def093b 100644 (file)
--- a/include/asm-i386/checksum.h
+++ b/include/asm-i386/checksum.h
@@ -43,10 +43,12 @@ unsigned int csum_partial_copy_nocheck ( const char *src, char *dst,
 }
 
 static __inline__
-unsigned int csum_partial_copy_from_user ( const char __user *src, char *dst,
+unsigned int csum_partial_copy_from_user(const char __user *src, char *dst,
                                                int len, int sum, int *err_ptr)
 {
-       return csum_partial_copy_generic ( (__force char *)src, dst, len, sum, err_ptr, NULL);
+       might_sleep();
+       return csum_partial_copy_generic((__force char *)src, dst,
+                                       len, sum, err_ptr, NULL);
 }
 
 /*
@@ -177,6 +179,7 @@ static __inline__ unsigned int csum_and_copy_to_user(const char *src,
                                                     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);