]> Pileus Git - ~andy/linux/commitdiff
mn10300: uaccess s/might_sleep/might_fault/
authorMichael S. Tsirkin <mst@redhat.com>
Sun, 26 May 2013 14:31:05 +0000 (17:31 +0300)
committerIngo Molnar <mingo@kernel.org>
Tue, 28 May 2013 07:41:08 +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-6-git-send-email-mst@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/mn10300/include/asm/uaccess.h

index 780560b330d9ef9109a76b0210185f3bc178ca8e..107508a0e1ddcbaf16e0fa4b5b2f63fab02e7792 100644 (file)
@@ -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));   \
 })