lkml.org 
[lkml]   [2021]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 087/243] s390/processor: always inline stap() and __load_psw_mask()
    Date
    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 962da04234af..0987c3fc45f5 100644
    --- a/arch/s390/include/asm/processor.h
    +++ b/arch/s390/include/asm/processor.h
    @@ -211,7 +211,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;

    @@ -250,7 +250,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


    \
     
     \ /
      Last update: 2021-07-19 19:40    [W:4.040 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site