Commit c4891f45 authored by Heiko Carstens's avatar Heiko Carstens Committed by Alexander Gordeev
Browse files

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: default avatarIlya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent 554f8842

arch/s390/include/asm/uaccess.h

+6 −7
Original line number Diff line number Diff line
@@ -159,16 +159,15 @@ copy_to_user_key(void __user *to, const void *from, unsigned long n, unsigned lo 
int __noreturn __put_user_bad(void);



#ifdef CONFIG_KMSAN

#define get_put_user_noinstr_attributes \

	noinline __maybe_unused __no_sanitize_memory

#define uaccess_kmsan_or_inline noinline __maybe_unused __no_sanitize_memory

#else

#define get_put_user_noinstr_attributes __always_inline

#define uaccess_kmsan_or_inline __always_inline

#endif



#ifdef CONFIG_CC_HAS_ASM_GOTO_OUTPUT



#define DEFINE_PUT_USER_NOINSTR(type)					\

static get_put_user_noinstr_attributes int				\

static uaccess_kmsan_or_inline int					\

__put_user_##type##_noinstr(unsigned type __user *to,			\

			    unsigned type *from,			\

			    unsigned long size)				\
@@ -193,7 +192,7 @@ Efault: \ 
#else /* CONFIG_CC_HAS_ASM_GOTO_OUTPUT */



#define DEFINE_PUT_USER_NOINSTR(type)					\

static get_put_user_noinstr_attributes int				\

static uaccess_kmsan_or_inline int					\

__put_user_##type##_noinstr(unsigned type __user *to,			\

			    unsigned type *from,			\

			    unsigned long size)				\
@@ -283,7 +282,7 @@ int __noreturn __get_user_bad(void); 
#ifdef CONFIG_CC_HAS_ASM_GOTO_OUTPUT



#define DEFINE_GET_USER_NOINSTR(type)					\

static get_put_user_noinstr_attributes int				\

static uaccess_kmsan_or_inline int					\

__get_user_##type##_noinstr(unsigned type *to,				\

			    const unsigned type __user *from,		\

			    unsigned long size)				\
@@ -309,7 +308,7 @@ Efault: \ 
#else /* CONFIG_CC_HAS_ASM_GOTO_OUTPUT */



#define DEFINE_GET_USER_NOINSTR(type)					\

static get_put_user_noinstr_attributes int				\

static uaccess_kmsan_or_inline int					\

__get_user_##type##_noinstr(unsigned type *to,				\

			    const unsigned type __user *from,		\

			    unsigned long size)				\