Skip to content

Commit

Permalink
powerpc/64s/exception: Clean up a missed SRR specifier
Browse files Browse the repository at this point in the history
[ Upstream commit c080a17 ]

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: 3f7fbd9 ("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>
  • Loading branch information
daxtens authored and gregkh committed Mar 17, 2021
1 parent 5e38bd7 commit 87a2ad9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/powerpc/kernel/exceptions-64s.S
Expand Up @@ -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)
Expand Down

0 comments on commit 87a2ad9

Please sign in to comment.