diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2016-07-04 20:35:08 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-07-05 16:09:07 +0200 |
| commit | 1b492600068d5fbd033196ce2bdb28735a23747e (patch) | |
| tree | 92a555be75e0e50c6c669413d7ac44e5ed7056e8 /arch/mips/kernel/branch.c | |
| parent | MIPS: inst.h: Rename b{eq,ne}zcji[al]c_op to pop{6,7}6_op (diff) | |
| download | linux-1b492600068d5fbd033196ce2bdb28735a23747e.tar.xz linux-1b492600068d5fbd033196ce2bdb28735a23747e.zip | |
MIPS: inst.h: Rename cbcond{0,1}_op to pop{1,3}0_op
The opcodes currently defined in inst.h as cbcond0_op & cbcond1_op are
actually defined in the MIPS base instruction set manuals as pop10 &
pop30 respectively. Rename them as such, for consistency with the
documentation.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/mips/kernel/branch.c')
| -rw-r--r-- | arch/mips/kernel/branch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index fb9ed96d7858..46c227fc98f5 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c @@ -809,8 +809,8 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, regs->cp0_epc += 8; break; #endif - case cbcond0_op: - case cbcond1_op: + case pop10_op: + case pop30_op: /* Only valid for MIPS R6 */ if (!cpu_has_mips_r6) { ret = -SIGILL; |