Commit 98fa2360 authored by Christophe Leroy's avatar Christophe Leroy Committed by Madhavan Srinivasan
Browse files

powerpc/8xx: Remove specific code from fast_exception_return 



The label 2: in fast_exception_return is a leftover from
commit b96bae3a ("powerpc/32: Replace ASM exception exit by C
exception exit from ppc64"). Once removed, we see that
fast_exception_return is a standalone function that is called only
from pieces of assembly dedicated to book3s/32 or booke, never by
common code or 8xx code.

So remove the clear of MSR[RI] enclosed in #ifdef CONFIG_PPC_8xx.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMadhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/39de3e0f0122b571474b1ba352a2dc3ad8cb71dd.1756304318.git.christophe.leroy@csgroup.eu
parent 7afe2383

arch/powerpc/kernel/entry_32.S

+1 −4
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ fast_exception_return: 
	beq	3f			/* if not, we've got problems */

#endif



2:	lwz	r10,_CCR(r11)

	lwz	r10,_CCR(r11)

	REST_GPRS(1, 6, r11)

	mtcr	r10

	lwz	r10,_LINK(r11)
@@ -225,9 +225,6 @@ fast_exception_return: 
	li	r10, 0

	stw	r10, 8(r11)

	REST_GPR(10, r11)

#if defined(CONFIG_PPC_8xx) && defined(CONFIG_PERF_EVENTS)

	mtspr	SPRN_NRI, r0

#endif

	mtspr	SPRN_SRR1,r9

	mtspr	SPRN_SRR0,r12

	REST_GPR(9, r11)