Skip to content

Commit

Permalink
MIPS: kernel: entry.S: Set correct ISA level for mips_ihb
Browse files Browse the repository at this point in the history
Commit 6ebb496("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: Markos Chandras <markos.chandras@imgtec.com>
Fixes: 6ebb496("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: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Markos Chandras authored and Ralf Baechle committed Apr 10, 2015
1 parent 5182221 commit aebac99
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/mips/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -185,7 +186,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)
Expand Down

0 comments on commit aebac99

Please sign in to comment.