mirror of
https://github.com/torvalds/linux.git
synced 2026-06-08 14:42:37 +02:00
Merge 11ad2a73de ("Merge tag 'asm-generic-fixes-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic") into android-mainline
Steps on the way to 5.10-rc2 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I856bf04d507e9bcdb4971ed4e26fc2ca805e862f
This commit is contained in:
commit
83a8892ba0
|
|
@ -12,7 +12,8 @@
|
|||
#ifdef CONFIG_UACCESS_MEMCPY
|
||||
#include <asm/unaligned.h>
|
||||
|
||||
static inline int __get_user_fn(size_t size, const void __user *from, void *to)
|
||||
static __always_inline int
|
||||
__get_user_fn(size_t size, const void __user *from, void *to)
|
||||
{
|
||||
BUILD_BUG_ON(!__builtin_constant_p(size));
|
||||
|
||||
|
|
@ -37,7 +38,8 @@ static inline int __get_user_fn(size_t size, const void __user *from, void *to)
|
|||
}
|
||||
#define __get_user_fn(sz, u, k) __get_user_fn(sz, u, k)
|
||||
|
||||
static inline int __put_user_fn(size_t size, void __user *to, void *from)
|
||||
static __always_inline int
|
||||
__put_user_fn(size_t size, void __user *to, void *from)
|
||||
{
|
||||
BUILD_BUG_ON(!__builtin_constant_p(size));
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user