Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / mips / kernel / jump_label.c

diff --git a/arch/mips/kernel/jump_label.c b/arch/mips/kernel/jump_label.c
index ab94392..662c8db 100644 (file)
--- a/arch/mips/kernel/jump_label.c
+++ b/arch/mips/kernel/jump_label.c
@@ -40,18 +40,38 @@ void arch_jump_label_transform(struct jump_entry *e,
 {
        union mips_instruction *insn_p;
        union mips_instruction insn;
+       long offset;
 
        insn_p = (union mips_instruction *)msk_isa16_mode(e->code);
 
-       /* Jump only works within an aligned region its delay slot is in. */
-       BUG_ON((e->target & ~J_RANGE_MASK) != ((e->code + 4) & ~J_RANGE_MASK));
-
        /* Target must have the right alignment and ISA must be preserved. */
        BUG_ON((e->target & J_ALIGN_MASK) != J_ISA_BIT);
 
        if (type == JUMP_LABEL_JMP) {
-               insn.j_format.opcode = J_ISA_BIT ? mm_j32_op : j_op;
-               insn.j_format.target = e->target >> J_RANGE_SHIFT;
+               if (!IS_ENABLED(CONFIG_CPU_MICROMIPS) && MIPS_ISA_REV >= 6) {
+                       offset = e->target - ((unsigned long)insn_p + 4);
+                       offset >>= 2;
+
+                       /*
+                        * The branch offset must fit in the instruction's 26
+                        * bit field.
+                        */
+                       WARN_ON((offset >= BIT(25)) ||
+                               (offset < -(long)BIT(25)));
+
+                       insn.j_format.opcode = bc6_op;
+                       insn.j_format.target = offset;
+               } else {
+                       /*
+                        * Jump only works within an aligned region its delay
+                        * slot is in.
+                        */
+                       WARN_ON((e->target & ~J_RANGE_MASK) !=
+                               ((e->code + 4) & ~J_RANGE_MASK));
+
+                       insn.j_format.opcode = J_ISA_BIT ? mm_j32_op : j_op;
+                       insn.j_format.target = e->target >> J_RANGE_SHIFT;
+               }
        } else {
                insn.word = 0; /* nop */
        }