Merge branch 'sched-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-imx.git] / arch / microblaze / include / asm / uaccess.h

diff --git a/arch/microblaze/include/asm/uaccess.h b/arch/microblaze/include/asm/uaccess.h
index 04e49553bdf978c534519550382a5dca8e98e6ed..0aa005703a0b5f348848afb5936f650d18f28322 100644 (file)
--- a/arch/microblaze/include/asm/uaccess.h
+++ b/arch/microblaze/include/asm/uaccess.h
@@ -145,7 +145,7 @@ static inline unsigned long __must_check __clear_user(void __user *to,
 static inline unsigned long __must_check clear_user(void __user *to,
                                                        unsigned long n)
 {
-       might_sleep();
+       might_fault();
        if (unlikely(!access_ok(VERIFY_WRITE, to, n)))
                return n;
 
@@ -371,7 +371,7 @@ extern long __user_bad(void);
 static inline long copy_from_user(void *to,
                const void __user *from, unsigned long n)
 {
-       might_sleep();
+       might_fault();
        if (access_ok(VERIFY_READ, from, n))
                return __copy_from_user(to, from, n);
        return n;
@@ -385,7 +385,7 @@ static inline long copy_from_user(void *to,
 static inline long copy_to_user(void __user *to,
                const void *from, unsigned long n)
 {
-       might_sleep();
+       might_fault();
        if (access_ok(VERIFY_WRITE, to, n))
                return __copy_to_user(to, from, n);
        return n;