Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / mn10300 / include / asm / uaccess.h

diff --git a/arch/mn10300/include/asm/uaccess.h b/arch/mn10300/include/asm/uaccess.h
index d7966e0f76988cfb2d36d0b480277961dcef7e3a..537278746a1534cead71e487aea7f13533e60b97 100644 (file)
--- a/arch/mn10300/include/asm/uaccess.h
+++ b/arch/mn10300/include/asm/uaccess.h
@@ -471,13 +471,13 @@ extern unsigned long __generic_copy_from_user(void *, const void __user *,
 
 #define __copy_to_user(to, from, n)                    \
 ({                                                     \
-       might_sleep();                                  \
+       might_fault();                                  \
        __copy_to_user_inatomic((to), (from), (n));     \
 })
 
 #define __copy_from_user(to, from, n)                  \
 ({                                                     \
-       might_sleep();                                  \
+       might_fault();                                  \
        __copy_from_user_inatomic((to), (from), (n));   \
 })