lkml.org 
[lkml]   [2021]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 256/290] powerpc/64s/exception: Clean up a missed SRR specifier
    Date
    From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    From: Daniel Axtens <dja@axtens.net>

    [ Upstream commit c080a173301ffc62cb6c76308c803c7fee05517a ]

    Nick's patch cleaning up the SRR specifiers in exception-64s.S missed
    a single instance of EXC_HV_OR_STD. Clean that up.

    Caught by clang's integrated assembler.

    Fixes: 3f7fbd97d07d ("powerpc/64s/exception: Clean up SRR specifiers")
    Signed-off-by: Daniel Axtens <dja@axtens.net>
    Acked-by: Nicholas Piggin <npiggin@gmail.com>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/20210225031006.1204774-2-dja@axtens.net
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/kernel/exceptions-64s.S | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
    index 3cde2fbd74fc..9d3b468bd2d7 100644
    --- a/arch/powerpc/kernel/exceptions-64s.S
    +++ b/arch/powerpc/kernel/exceptions-64s.S
    @@ -470,7 +470,7 @@ DEFINE_FIXED_SYMBOL(\name\()_common_real)

    ld r10,PACAKMSR(r13) /* get MSR value for kernel */
    /* MSR[RI] is clear iff using SRR regs */
    - .if IHSRR == EXC_HV_OR_STD
    + .if IHSRR_IF_HVMODE
    BEGIN_FTR_SECTION
    xori r10,r10,MSR_RI
    END_FTR_SECTION_IFCLR(CPU_FTR_HVMODE)
    --
    2.30.1


    \
     
     \ /
      Last update: 2021-03-15 15:46    [W:2.078 / U:0.936 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site