diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-03-08 11:07:30 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-03-08 11:07:30 -0800 |
commit | c6380ecd8e9bee7aba3d9a5a94b58168244c4a61 (patch) | |
tree | f8d9522c66e805f638399e094f8e0dfd92584d06 /lib/usercopy.c | |
parent | cdc2466df40f26af60f6b18123069bd52336a80c (diff) | |
parent | 661e50bc853209e41a5c14a290ca4decc43cbfd1 (diff) |
Merge tag 'v4.16-rc4' into next
Sync up with mainline to bring in RAVE MFD device core.
Diffstat (limited to 'lib/usercopy.c')
-rw-r--r-- | lib/usercopy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/usercopy.c b/lib/usercopy.c index 15e2e6fb060e..3744b2a8e591 100644 --- a/lib/usercopy.c +++ b/lib/usercopy.c @@ -20,7 +20,7 @@ EXPORT_SYMBOL(_copy_from_user); #endif #ifndef INLINE_COPY_TO_USER -unsigned long _copy_to_user(void *to, const void __user *from, unsigned long n) +unsigned long _copy_to_user(void __user *to, const void *from, unsigned long n) { might_fault(); if (likely(access_ok(VERIFY_WRITE, to, n))) { |