MIPS: Rename `sigill_r6' to `sigill_r2r6' in `__compute_return_epc_for_insn'

Use the more accurate `sigill_r2r6' name for the label used in the case
of sending SIGILL in the absence of the instruction emulator for an
earlier ISA level instruction that has been removed as from the R6 ISA,
so that the `sigill_r6' name is freed for the situation where an R6
instruction is not supposed to be interpreted, because the executing
processor does not support the R6 ISA.

Signed-off-by: Maciej W. Rozycki <macro@imgtec.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: stable@vger.kernel.org # 3.19+
Patchwork: https://patchwork.linux-mips.org/patch/16397/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c
index 81b5608acd5c823b8664bd15f59f3e33fcb941c8..df5c32b38408d12d02226846c86f68c1b911fb55 100644 (file)
--- a/arch/mips/kernel/branch.c
+++ b/arch/mips/kernel/branch.c
@@ -431,7 +431,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs,
                        /* Fall through */
                case jr_op:
                        if (NO_R6EMU && insn.r_format.func == jr_op)
-                               goto sigill_r6;
+                               goto sigill_r2r6;
                        regs->cp0_epc = regs->regs[insn.r_format.rs];
                        break;
                }
@@ -446,7 +446,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs,
                switch (insn.i_format.rt) {
                case bltzl_op:
                        if (NO_R6EMU)
-                               goto sigill_r6;
+                               goto sigill_r2r6;
                case bltz_op:
                        if ((long)regs->regs[insn.i_format.rs] < 0) {
                                epc = epc + 4 + (insn.i_format.simmediate << 2);
@@ -459,7 +459,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs,
 
                case bgezl_op:
                        if (NO_R6EMU)
-                               goto sigill_r6;
+                               goto sigill_r2r6;
                case bgez_op:
                        if ((long)regs->regs[insn.i_format.rs] >= 0) {
                                epc = epc + 4 + (insn.i_format.simmediate << 2);
@@ -574,7 +574,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs,
         */
        case beql_op:
                if (NO_R6EMU)
-                       goto sigill_r6;
+                       goto sigill_r2r6;
        case beq_op:
                if (regs->regs[insn.i_format.rs] ==
                    regs->regs[insn.i_format.rt]) {
@@ -588,7 +588,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs,
 
        case bnel_op:
                if (NO_R6EMU)
-                       goto sigill_r6;
+                       goto sigill_r2r6;
        case bne_op:
                if (regs->regs[insn.i_format.rs] !=
                    regs->regs[insn.i_format.rt]) {
@@ -602,7 +602,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs,
 
        case blezl_op: /* not really i_format */
                if (!insn.i_format.rt && NO_R6EMU)
-                       goto sigill_r6;
+                       goto sigill_r2r6;
        case blez_op:
                /*
                 * Compact branches for R6 for the
@@ -637,7 +637,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs,
 
        case bgtzl_op:
                if (!insn.i_format.rt && NO_R6EMU)
-                       goto sigill_r6;
+                       goto sigill_r2r6;
        case bgtz_op:
                /*
                 * Compact branches for R6 for the
@@ -836,7 +836,7 @@ sigill_dsp:
                current->comm);
        force_sig(SIGILL, current);
        return -EFAULT;
-sigill_r6:
+sigill_r2r6:
        pr_info("%s: R2 branch but r2-to-r6 emulator is not preset - sending SIGILL.\n",
                current->comm);
        force_sig(SIGILL, current);