Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5176a4d1 authored by Heiko Carstens's avatar Heiko Carstens Committed by Greg Kroah-Hartman
Browse files

s390/processor: always inline stap() and __load_psw_mask() 



[ Upstream commit 9c9a915afd90f7534c16a71d1cd44b58596fddf3 ]

s390 is the only architecture which makes use of the __no_kasan_or_inline
attribute for two functions. Given that both stap() and __load_psw_mask()
are very small functions they can and should be always inlined anyway.

Therefore get rid of __no_kasan_or_inline and always inline these
functions.

Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 542d85dd

arch/s390/include/asm/processor.h

+2 −2
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static inline unsigned long current_stack_pointer(void) 
	return sp;

}



static __no_kasan_or_inline unsigned short stap(void)

static __always_inline unsigned short stap(void)

{

	unsigned short cpu_address;
@@ -254,7 +254,7 @@ static inline void __load_psw(psw_t psw) 
 * Set PSW mask to specified value, while leaving the

 * PSW addr pointing to the next instruction.

 */

static __no_kasan_or_inline void __load_psw_mask(unsigned long mask)

static __always_inline void __load_psw_mask(unsigned long mask)

{

	unsigned long addr;

	psw_t psw;