]> Pileus Git - ~andy/linux/commitdiff
frv: uaccess s/might_sleep/might_fault/
authorMichael S. Tsirkin <mst@redhat.com>
Sun, 26 May 2013 14:30:47 +0000 (17:30 +0300)
committerIngo Molnar <mingo@kernel.org>
Tue, 28 May 2013 07:41:07 +0000 (09:41 +0200)
The only reason uaccess routines might sleep
is if they fault. Make this explicit.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1369577426-26721-3-git-send-email-mst@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/frv/include/asm/uaccess.h

index 0b67ec5b44141ff5216184380355554197ba2107..3ac9a59d65d4129142d06ba9516455e0c5dc96db 100644 (file)
@@ -280,14 +280,14 @@ extern long __memcpy_user(void *dst, const void *src, unsigned long count);
 static inline unsigned long __must_check
 __copy_to_user(void __user *to, const void *from, unsigned long n)
 {
-       might_sleep();
+       might_fault();
        return __copy_to_user_inatomic(to, from, n);
 }
 
 static inline unsigned long
 __copy_from_user(void *to, const void __user *from, unsigned long n)
 {
-       might_sleep();
+       might_fault();
        return __copy_from_user_inatomic(to, from, n);
 }