leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

asm-generic: mark __{get,put}_user_fn as __always_inline

Browse Source 
Without the explicit __always_inline, some RISC-V configs place the
functions out of line, triggering the BUILD_BUG_ON checks in the
function.

Fixes: 11129e8ed4 ("riscv: use memcpy based uaccess for nommu again")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Christoph Hellwig 2020-10-27 09:50:17 +01:00 committed by Arnd Bergmann
parent 3650b228f8
commit 0bcd0a2be8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/asm-generic/uaccess.h
View File

@ -12,7 +12,8 @@
#ifdef CONFIG_UACCESS_MEMCPY #ifdef CONFIG_UACCESS_MEMCPY
#include <asm/unaligned.h> #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)); 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) #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)); BUILD_BUG_ON(!__builtin_constant_p(size));