diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2022-04-22 12:32:01 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2022-04-22 12:32:01 +0200 |
| commit | 3398b12d10271c008ed48fecc6577a5940d7cdf3 (patch) | |
| tree | a42c0f8e5bf46ee32ea5d2520b385f1b8546d8ed /lib | |
| parent | objtool: Fix code relocs vs weak symbols (diff) | |
| parent | x86/Kconfig: fix the spelling of 'becoming' in X86_KERNEL_IBT config (diff) | |
| download | linux-dev-3398b12d10271c008ed48fecc6577a5940d7cdf3.tar.xz linux-dev-3398b12d10271c008ed48fecc6577a5940d7cdf3.zip | |
Merge branch 'tip/x86/urgent'
Merge the x86/urgent objtool/IBT changes as a base
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/strncpy_from_user.c | 2 | ||||
| -rw-r--r-- | lib/strnlen_user.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c index 08fc72d3ed16..6432b8c3e431 100644 --- a/lib/strncpy_from_user.c +++ b/lib/strncpy_from_user.c @@ -25,7 +25,7 @@ * hit it), 'max' is the address space maximum (and we return * -EFAULT if we hit it). */ -static inline long do_strncpy_from_user(char *dst, const char __user *src, +static __always_inline long do_strncpy_from_user(char *dst, const char __user *src, unsigned long count, unsigned long max) { const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS; diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c index bffa0ebf9f8b..feeb935a2299 100644 --- a/lib/strnlen_user.c +++ b/lib/strnlen_user.c @@ -20,7 +20,7 @@ * if it fits in a aligned 'long'. The caller needs to check * the return value against "> max". */ -static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max) +static __always_inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max) { const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS; unsigned long align, res = 0; |