Merge commit 'v2.6.30-rc6' into perfcounters/core

Merge reason: this branch was on an -rc4 base, merge it up to -rc6
              to get the latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/mips/include/asm/checksum.h b/arch/mips/include/asm/checksum.h
index 290485ac5407..f2f7c6c264da 100644
--- a/arch/mips/include/asm/checksum.h
+++ b/arch/mips/include/asm/checksum.h
@@ -40,7 +40,7 @@ static inline
 __wsum csum_partial_copy_from_user(const void __user *src, void *dst, int len,
                                    __wsum sum, int *err_ptr)
 {
-        might_sleep();
+        might_fault();
         return __csum_partial_copy_user((__force void *)src, dst,
                                         len, sum, err_ptr);
 }
@@ -53,7 +53,7 @@ static inline
 __wsum csum_and_copy_to_user(const void *src, void __user *dst, int len,
                              __wsum sum, int *err_ptr)
 {
-        might_sleep();
+        might_fault();
         if (access_ok(VERIFY_WRITE, dst, len))
                 return __csum_partial_copy_user(src, (__force void *)dst,
                                                 len, sum, err_ptr);