diff options
| author |  Nicholas Piggin <npiggin@gmail.com>
| 2022-10-04 23:29:52 +1000 |
|---|---|---|
| committer |  Michael Ellerman <mpe@ellerman.id.au>
| 2022-10-05 11:09:22 +1100 |
| commit | b2e82e495a528eed77c15f3923c2b049a21d7280 (patch) | |
| tree | 5e6284602fc2e6d56425d83ec22b89571b890fe3 /arch/powerpc | |
| parent | powerpc/64: Fix msr_check_and_set/clear MSR[EE] race (diff) | |
| download | linux-b2e82e495a528eed77c15f3923c2b049a21d7280.tar.gz linux-b2e82e495a528eed77c15f3923c2b049a21d7280.tar.bz2 linux-b2e82e495a528eed77c15f3923c2b049a21d7280.zip | |
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: bf75a3258a403 ("powerpc/64s/interrupt: move early boot ILE fixup into a macro")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
[mpe: Mismerge by yours truly -_-]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20221004132952.984341-1-npiggin@gmail.com
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 87ce00766f52..5381a43e50fe 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -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 |