History

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

Linus Torvalds committed 6 years ago

Commit 11ad2a72 parents 65b55d4 0bcd0a21 file · +4 −2Browse files

Unified · Split

include/asm-generic/uaccess.h+4−2
@@ -12,7 +12,8 @@ · 11 unmodified lines
12#ifdef CONFIG_UACCESS_MEMCPY12#ifdef CONFIG_UACCESS_MEMCPY
13#include <asm/unaligned.h>13#include <asm/unaligned.h>
14 14
15static inline int __get_user_fn(size_t size, const void __user *from, void *to)15static __always_inline int
16__get_user_fn(size_t size, const void __user *from, void *to)
16{17{
17 BUILD_BUG_ON(!__builtin_constant_p(size));18 BUILD_BUG_ON(!__builtin_constant_p(size));
18 19
@@ -37,7 +38,8 @@ static inline int __get_user_fn(size_t size, const void __user *from, void *to) · 18 unmodified lines
37}38}
38#define __get_user_fn(sz, u, k) __get_user_fn(sz, u, k)39#define __get_user_fn(sz, u, k) __get_user_fn(sz, u, k)
39 40
40static inline int __put_user_fn(size_t size, void __user *to, void *from)41static __always_inline int
42__put_user_fn(size_t size, void __user *to, void *from)
41{43{
42 BUILD_BUG_ON(!__builtin_constant_p(size));44 BUILD_BUG_ON(!__builtin_constant_p(size));
43 45