diff options
| -rw-r--r-- | arch/ppc/kernel/traps.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c index f8e7e324a173..c65731e8bc65 100644 --- a/arch/ppc/kernel/traps.c +++ b/arch/ppc/kernel/traps.c | |||
| @@ -408,12 +408,7 @@ static int emulate_string_inst(struct pt_regs *regs, u32 instword) | |||
| 408 | 408 | ||
| 409 | /* Early out if we are an invalid form of lswx */ | 409 | /* Early out if we are an invalid form of lswx */ |
| 410 | if ((instword & INST_STRING_MASK) == INST_LSWX) | 410 | if ((instword & INST_STRING_MASK) == INST_LSWX) |
| 411 | if ((rA >= rT) || (NB_RB >= rT) || (rT == rA) || (rT == NB_RB)) | 411 | if ((rT == rA) || (rT == NB_RB)) |
| 412 | return -EINVAL; | ||
| 413 | |||
| 414 | /* Early out if we are an invalid form of lswi */ | ||
| 415 | if ((instword & INST_STRING_MASK) == INST_LSWI) | ||
| 416 | if ((rA >= rT) || (rT == rA)) | ||
| 417 | return -EINVAL; | 412 | return -EINVAL; |
| 418 | 413 | ||
| 419 | EA = (rA == 0) ? 0 : regs->gpr[rA]; | 414 | EA = (rA == 0) ? 0 : regs->gpr[rA]; |
