diff options
| author | Linus Torvalds | 2020-10-30 13:11:46 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2020-10-30 13:11:46 -0700 |
| commit | 11ad2a73de10bbebb71199f29abdfc1c2e70d231 (patch) | |
| tree | fd0bc5ce09d10b889462a21bf2fc6af656065c50 /include | |
| parent | 65b55d4c85e59e0cc946c1ac171ff59bc6e1d7f9 (diff) | |
| parent | 0bcd0a2be8c9ef39d84d167ff85359a49f7be175 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/uaccess.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h index 45f9872fd747..4973328f3c6e 100644 --- a/include/asm-generic/uaccess.h +++ b/include/asm-generic/uaccess.h @@ -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)); |