diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2013-05-26 17:30:47 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-05-28 09:41:07 +0200 |
| commit | b607ae78ac8a78f8e5e36817500e7c311519f032 (patch) | |
| tree | a64b7f5c4f4651a55c9f4fe9edd5992a4596e408 /arch/frv | |
| parent | 56d2ef789f7c424918abdf6b95d84a64c1473220 (diff) | |
| download | linux-stable-b607ae78ac8a78f8e5e36817500e7c311519f032.tar.gz linux-stable-b607ae78ac8a78f8e5e36817500e7c311519f032.tar.bz2 linux-stable-b607ae78ac8a78f8e5e36817500e7c311519f032.zip | |
frv: uaccess s/might_sleep/might_fault/
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>
Diffstat (limited to 'arch/frv')
| -rw-r--r-- | arch/frv/include/asm/uaccess.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/frv/include/asm/uaccess.h b/arch/frv/include/asm/uaccess.h index 0b67ec5b4414..3ac9a59d65d4 100644 --- a/arch/frv/include/asm/uaccess.h +++ b/arch/frv/include/asm/uaccess.h @@ -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); } |