diff options
Diffstat (limited to 'arch/mips/kernel/branch.c')
-rw-r--r-- | arch/mips/kernel/branch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index e198d9bf17bb..7b2df224f041 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c | |||
@@ -513,7 +513,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, | |||
513 | if (regs->regs[insn.i_format.rs] == | 513 | if (regs->regs[insn.i_format.rs] == |
514 | regs->regs[insn.i_format.rt]) { | 514 | regs->regs[insn.i_format.rt]) { |
515 | epc = epc + 4 + (insn.i_format.simmediate << 2); | 515 | epc = epc + 4 + (insn.i_format.simmediate << 2); |
516 | if (insn.i_format.rt == beql_op) | 516 | if (insn.i_format.opcode == beql_op) |
517 | ret = BRANCH_LIKELY_TAKEN; | 517 | ret = BRANCH_LIKELY_TAKEN; |
518 | } else | 518 | } else |
519 | epc += 8; | 519 | epc += 8; |
@@ -525,7 +525,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, | |||
525 | if (regs->regs[insn.i_format.rs] != | 525 | if (regs->regs[insn.i_format.rs] != |
526 | regs->regs[insn.i_format.rt]) { | 526 | regs->regs[insn.i_format.rt]) { |
527 | epc = epc + 4 + (insn.i_format.simmediate << 2); | 527 | epc = epc + 4 + (insn.i_format.simmediate << 2); |
528 | if (insn.i_format.rt == bnel_op) | 528 | if (insn.i_format.opcode == bnel_op) |
529 | ret = BRANCH_LIKELY_TAKEN; | 529 | ret = BRANCH_LIKELY_TAKEN; |
530 | } else | 530 | } else |
531 | epc += 8; | 531 | epc += 8; |
@@ -537,7 +537,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, | |||
537 | /* rt field assumed to be zero */ | 537 | /* rt field assumed to be zero */ |
538 | if ((long)regs->regs[insn.i_format.rs] <= 0) { | 538 | if ((long)regs->regs[insn.i_format.rs] <= 0) { |
539 | epc = epc + 4 + (insn.i_format.simmediate << 2); | 539 | epc = epc + 4 + (insn.i_format.simmediate << 2); |
540 | if (insn.i_format.rt == bnel_op) | 540 | if (insn.i_format.opcode == blezl_op) |
541 | ret = BRANCH_LIKELY_TAKEN; | 541 | ret = BRANCH_LIKELY_TAKEN; |
542 | } else | 542 | } else |
543 | epc += 8; | 543 | epc += 8; |
@@ -549,7 +549,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, | |||
549 | /* rt field assumed to be zero */ | 549 | /* rt field assumed to be zero */ |
550 | if ((long)regs->regs[insn.i_format.rs] > 0) { | 550 | if ((long)regs->regs[insn.i_format.rs] > 0) { |
551 | epc = epc + 4 + (insn.i_format.simmediate << 2); | 551 | epc = epc + 4 + (insn.i_format.simmediate << 2); |
552 | if (insn.i_format.rt == bnel_op) | 552 | if (insn.i_format.opcode == bgtzl_op) |
553 | ret = BRANCH_LIKELY_TAKEN; | 553 | ret = BRANCH_LIKELY_TAKEN; |
554 | } else | 554 | } else |
555 | epc += 8; | 555 | epc += 8; |