diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2013-05-26 10:30:42 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-05-28 03:41:06 -0400 |
commit | 56d2ef789f7c424918abdf6b95d84a64c1473220 (patch) | |
tree | 4a0bce4541c71758c11c467e56c2647b48760893 /arch/arm64/include | |
parent | e0acd0bd0594161be44c054bb6b984972f444beb (diff) |
arm64: 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>
Acked-by: Catalin Marinas <catalin.marinas@arm.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-2-git-send-email-mst@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/include')
-rw-r--r-- | arch/arm64/include/asm/uaccess.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h index 008f8481da65..edb3d5c73a32 100644 --- a/arch/arm64/include/asm/uaccess.h +++ b/arch/arm64/include/asm/uaccess.h | |||
@@ -166,7 +166,7 @@ do { \ | |||
166 | 166 | ||
167 | #define get_user(x, ptr) \ | 167 | #define get_user(x, ptr) \ |
168 | ({ \ | 168 | ({ \ |
169 | might_sleep(); \ | 169 | might_fault(); \ |
170 | access_ok(VERIFY_READ, (ptr), sizeof(*(ptr))) ? \ | 170 | access_ok(VERIFY_READ, (ptr), sizeof(*(ptr))) ? \ |
171 | __get_user((x), (ptr)) : \ | 171 | __get_user((x), (ptr)) : \ |
172 | ((x) = 0, -EFAULT); \ | 172 | ((x) = 0, -EFAULT); \ |
@@ -227,7 +227,7 @@ do { \ | |||
227 | 227 | ||
228 | #define put_user(x, ptr) \ | 228 | #define put_user(x, ptr) \ |
229 | ({ \ | 229 | ({ \ |
230 | might_sleep(); \ | 230 | might_fault(); \ |
231 | access_ok(VERIFY_WRITE, (ptr), sizeof(*(ptr))) ? \ | 231 | access_ok(VERIFY_WRITE, (ptr), sizeof(*(ptr))) ? \ |
232 | __put_user((x), (ptr)) : \ | 232 | __put_user((x), (ptr)) : \ |
233 | -EFAULT; \ | 233 | -EFAULT; \ |