Commit b2e82e49 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

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: bf75a325 ("powerpc/64s/interrupt: move early boot ILE fixup into a macro")
Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
[mpe: Mismerge by yours truly -_-]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20221004132952.984341-1-npiggin@gmail.com
parent 0fa68318

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

+0 −1
Original line number Diff line number Diff line
@@ -590,7 +590,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR) 
	std	r9,_TRAP(r1)		/* set trap number		*/

	li	r10,0

	LOAD_REG_IMMEDIATE(r11, STACK_FRAME_REGS_MARKER)

	rldimi	r11, r11, 32, 0

	std	r10,RESULT(r1)		/* clear regs->result		*/

	std	r11,STACK_FRAME_OVERHEAD-16(r1) /* mark the frame	*/

.endm