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/strncpy_from_user.c | |
| parent | 4abff6d48dbcea8200c7ea35ba70c242d128ebf3 (diff) | |
| parent | 4cdfc11b2836e659c0b7b31152a8b0d976167b59 (diff) | |
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/strncpy_from_user.c')
| -rw-r--r-- | lib/strncpy_from_user.c | 2 |
1 files changed, 1 insertions, 1 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; |