asm-generic: fixes for v5.10

There is one small bugfix, fixing a build regression for RISC-V
 
 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAl+cNsoACgkQmmx57+YA
 GNnVXQ//WuMPr7/bUDtSKzDNZKqV7dig7Cjv0bIr3A+LA3ximoJRvMNAe3XJDj0Y
 /OmIOf3I0fGwWhm2omujC4DfYzzimGq/aOq2RlOrqvnr06y4HtWiblnFZQjf0i9T
 v0j1jQLR4gZFazbr7p9n0Ib2sLK96d+2Yhb8m1pxrN1vG26D3Yrd4hHZCUi8CT+H
 b++i1X+FkXLdtjiR5yvIXCFbAU5ykvKBf/Hw4qr+5IZuxl2L1Lv3tXaTI77MiA1Y
 jJSc/l+kFc8RMYaOoK2GRuuIxiAwJwxLyPOeS6yBcHxlJ0bqQjbcpNTRok073fFf
 Ilnb4mL4qlWlf+w3EGd8cZ+kL/pY+48B8c0EyZ3h/P0FyDEMstWlxDZ4H/yfNtxC
 d/uCHh8wNAHPwAtLgeC26jE9XY6YYxYIQ96tcxaM6Okdwpp0O/7j9jH6u1Ph/bTJ
 Xio0olowJWmeC8LihJJ9tzAv8E/Yp3GdufWjm4Ruvcdg0pGnP0Wx+u1sJUWmb0Kh
 ho2M1pI/jx/Gmn2BZ02d9timAj4Z/zM84JcFbsucvkzlqic8eMi44a/LH4MlK7H4
 yofX1MRTlxJTaXCwoTkFiO08iJlOa4SwHdkByfxdyEX66SJELhVz04tR5Jz19V5u
 ++ATlVq89jVxpLdHCUAjf7LOHwfXzFyiLyCN3no+/SEUJoz1pTA=
 =vygx
 -----END PGP SIGNATURE-----

Merge tag 'asm-generic-fixes-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

Pull asm-generic fix from Arnd Bergmann:
 "One small bugfix, fixing a build regression for RISC-V"

* tag 'asm-generic-fixes-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic: mark __{get,put}_user_fn as __always_inline
This commit is contained in:
Linus Torvalds 2020-10-30 13:11:46 -07:00
commit 11ad2a73de

View file

@ -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));