diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-22 17:21:27 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-22 17:21:27 -0700 |
commit | bd28b14591b98f696bc9f94c5ba2e598ca487dfd (patch) | |
tree | 5cd165412fa7dec2dbbac28ff6d8d5b12d3011f4 /kernel/futex.c | |
parent | 5b09c3edecd37ec1a52fbd5ae97a19734edc7a77 (diff) | |
download | op-kernel-dev-bd28b14591b98f696bc9f94c5ba2e598ca487dfd.zip op-kernel-dev-bd28b14591b98f696bc9f94c5ba2e598ca487dfd.tar.gz |
x86: remove more uaccess_32.h complexity
I'm looking at trying to possibly merge the 32-bit and 64-bit versions
of the x86 uaccess.h implementation, but first this needs to be cleaned
up.
For example, the 32-bit version of "__copy_from_user_inatomic()" is
mostly the special cases for the constant size, and it's actually almost
never relevant. Most users aren't actually using a constant size
anyway, and the few cases that do small constant copies are better off
just using __get_user() instead.
So get rid of the unnecessary complexity.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/futex.c')
-rw-r--r-- | kernel/futex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index c20f06f..ee25f5b 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -729,7 +729,7 @@ static int get_futex_value_locked(u32 *dest, u32 __user *from) int ret; pagefault_disable(); - ret = __copy_from_user_inatomic(dest, from, sizeof(u32)); + ret = __get_user(*dest, from); pagefault_enable(); return ret ? -EFAULT : 0; |