Skip to content

Commit 32746df

Browse files
chleroympe
authored andcommitted
powerpc/rtas: Remove machine_check_in_rtas()
machine_check_in_rtas() is just a trap. Do the trap directly in the machine check exception handler. Signed-off-by: Christophe Leroy <[email protected]> Acked-by: Naveen N. Rao <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/78899f40f89cb3c4f69bdff7f04eb6ec7cb753d5.1585670437.git.christophe.leroy@c-s.fr
1 parent e620931 commit 32746df

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

arch/powerpc/kernel/entry_32.S

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,10 +1380,4 @@ _GLOBAL(enter_rtas)
13801380
mtspr SPRN_SRR0,r8
13811381
mtspr SPRN_SRR1,r9
13821382
RFI /* return to caller */
1383-
1384-
.globl machine_check_in_rtas
1385-
machine_check_in_rtas:
1386-
twi 31,0,0
1387-
/* XXX load up BATs and panic */
1388-
13891383
#endif /* CONFIG_PPC_RTAS */

arch/powerpc/kernel/head_32.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ MachineCheck:
297297
cmpwi cr1, r4, 0
298298
#endif
299299
beq cr1, machine_check_tramp
300-
b machine_check_in_rtas
300+
twi 31, 0, 0
301301
#else
302302
b machine_check_tramp
303303
#endif

0 commit comments

Comments
 (0)