Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3749ec1e authored by Markos Chandras's avatar Markos Chandras Committed by Sasha Levin
Browse files

MIPS: kernel: entry.S: Set correct ISA level for mips_ihb 



[ Upstream commit aebac99384f7a6d83a3dcd42bf2481eed2670083 ]

Commit 6ebb496ffc7e("MIPS: kernel: entry.S: Add MIPS R6 related
definitions") added the MIPSR6 definition but it did not update the
ISA level of the actual assembly code so a pre-MIPSR6 jr.hb instruction
was generated instead. Fix this by using the MISP_ISA_LEVEL_RAW macro.

Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Fixes: 6ebb496ffc7e("MIPS: kernel: entry.S: Add MIPS R6 related definitions")
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9386/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent a23817cb

arch/mips/kernel/entry.S

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include <asm/asm.h>

#include <asm/asmmacro.h>

#include <asm/compiler.h>

#include <asm/regdef.h>

#include <asm/mipsregs.h>

#include <asm/stackframe.h>
@@ -166,7 +167,7 @@ syscall_exit_work: 
 * For C code use the inline version named instruction_hazard().

 */

LEAF(mips_ihb)

	.set	mips32r2

	.set	MIPS_ISA_LEVEL_RAW

	jr.hb	ra

	nop

	END(mips_ihb)