Skip to content

Commit b2e82e4

Browse files
npigginmpe
authored andcommitted
powerpc/64s/interrupt: Fix stack frame regs marker
The value of the stack frame regs marker that gets saved on the stack in interrupt entry code does not match the regs marker value, which breaks stack frame marker matching. This stray instruction looks to have been introduced in a mismerge. Fixes: bf75a32 ("powerpc/64s/interrupt: move early boot ILE fixup into a macro") Signed-off-by: Nicholas Piggin <[email protected]> [mpe: Mismerge by yours truly -_-] Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 0fa6831 commit b2e82e4

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

arch/powerpc/kernel/exceptions-64s.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
590590
std r9,_TRAP(r1) /* set trap number */
591591
li r10,0
592592
LOAD_REG_IMMEDIATE(r11, STACK_FRAME_REGS_MARKER)
593-
rldimi r11, r11, 32, 0
594593
std r10,RESULT(r1) /* clear regs->result */
595594
std r11,STACK_FRAME_OVERHEAD-16(r1) /* mark the frame */
596595
.endm

0 commit comments

Comments
 (0)