Skip to content

Commit 6102c00

Browse files
npigginmpe
authored andcommitted
powerpc/64s: Fix unnecessary machine check handler relocation branch
Similarly to commit 2563a70 ("powerpc/64s: Remove unnecessary relocation branch from idle handler"), the machine check handler has a BRANCH_TO from relocated to relocated code, which is unnecessary. It has also caused build errors with some toolchains: arch/powerpc/kernel/exceptions-64s.S: Assembler messages: arch/powerpc/kernel/exceptions-64s.S:395: Error: operand out of range (0xffffffffffff8280 is not between 0x0000000000000000 and 0x000000000000ffff) Fixes: 1945bc4 ("powerpc/64s: Fix POWER9 machine check handler from stop state") Signed-off-by: Nicholas Piggin <[email protected]> Reported-and-tested-by : Abdul Haleem <[email protected]> Signed-off-by: Michael Ellerman <[email protected]>
1 parent ba95b5d commit 6102c00

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,9 +391,7 @@ EXC_COMMON_BEGIN(machine_check_handle_early)
391391
*/
392392
BEGIN_FTR_SECTION
393393
rlwinm. r11,r12,47-31,30,31
394-
beq- 4f
395-
BRANCH_TO_COMMON(r10, machine_check_idle_common)
396-
4:
394+
bne machine_check_idle_common
397395
END_FTR_SECTION_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206)
398396
#endif
399397

0 commit comments

Comments
 (0)