| From 02c5b103e86bcbae66cad40b240f262d4044b256 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 10 Jun 2021 17:50:25 +0200 |
| Subject: s390/processor: always inline stap() and __load_psw_mask() |
| |
| From: Heiko Carstens <hca@linux.ibm.com> |
| |
| [ 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: Heiko Carstens <hca@linux.ibm.com> |
| Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/s390/include/asm/processor.h | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h |
| index 023a15dc25a3..dbd380d81133 100644 |
| --- a/arch/s390/include/asm/processor.h |
| +++ b/arch/s390/include/asm/processor.h |
| @@ -207,7 +207,7 @@ static __always_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; |
| |
| @@ -246,7 +246,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; |
| -- |
| 2.30.2 |
| |
