Skip to content

Commit c4891f4

Browse files
hcahcaAlexander Gordeev
authored andcommitted
s390/uaccess: Rename get_put_user_noinstr_attributes to uaccess_kmsan_or_inline
Rename get_put_user_noinstr_attributes to a more generic uaccess_kmsan_or_inline name. This allows to use it for other non put_user()/get_user() uaccess functions withour causing confusion. Acked-by: Ilya Leoshkevich <iii@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
1 parent 554f884 commit c4891f4

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

arch/s390/include/asm/uaccess.h

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,16 +159,15 @@ copy_to_user_key(void __user *to, const void *from, unsigned long n, unsigned lo
159159
int __noreturn __put_user_bad(void);
160160

161161
#ifdef CONFIG_KMSAN
162-
#define get_put_user_noinstr_attributes \
163-
noinline __maybe_unused __no_sanitize_memory
162+
#define uaccess_kmsan_or_inline noinline __maybe_unused __no_sanitize_memory
164163
#else
165-
#define get_put_user_noinstr_attributes __always_inline
164+
#define uaccess_kmsan_or_inline __always_inline
166165
#endif
167166

168167
#ifdef CONFIG_CC_HAS_ASM_GOTO_OUTPUT
169168

170169
#define DEFINE_PUT_USER_NOINSTR(type) \
171-
static get_put_user_noinstr_attributes int \
170+
static uaccess_kmsan_or_inline int \
172171
__put_user_##type##_noinstr(unsigned type __user *to, \
173172
unsigned type *from, \
174173
unsigned long size) \
@@ -193,7 +192,7 @@ Efault: \
193192
#else /* CONFIG_CC_HAS_ASM_GOTO_OUTPUT */
194193

195194
#define DEFINE_PUT_USER_NOINSTR(type) \
196-
static get_put_user_noinstr_attributes int \
195+
static uaccess_kmsan_or_inline int \
197196
__put_user_##type##_noinstr(unsigned type __user *to, \
198197
unsigned type *from, \
199198
unsigned long size) \
@@ -283,7 +282,7 @@ int __noreturn __get_user_bad(void);
283282
#ifdef CONFIG_CC_HAS_ASM_GOTO_OUTPUT
284283

285284
#define DEFINE_GET_USER_NOINSTR(type) \
286-
static get_put_user_noinstr_attributes int \
285+
static uaccess_kmsan_or_inline int \
287286
__get_user_##type##_noinstr(unsigned type *to, \
288287
const unsigned type __user *from, \
289288
unsigned long size) \
@@ -309,7 +308,7 @@ Efault: \
309308
#else /* CONFIG_CC_HAS_ASM_GOTO_OUTPUT */
310309

311310
#define DEFINE_GET_USER_NOINSTR(type) \
312-
static get_put_user_noinstr_attributes int \
311+
static uaccess_kmsan_or_inline int \
313312
__get_user_##type##_noinstr(unsigned type *to, \
314313
const unsigned type __user *from, \
315314
unsigned long size) \

0 commit comments

Comments
 (0)