diff options
Diffstat (limited to 'arch/powerpc/kernel/traps.c')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index c72e7e9..a59a2ba 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -968,10 +968,7 @@ static int emulate_instruction(struct pt_regs *regs) #ifdef CONFIG_PPC64 /* Emulate the mfspr rD, DSCR. */ - if ((((instword & PPC_INST_MFSPR_DSCR_USER_MASK) == - PPC_INST_MFSPR_DSCR_USER) || - ((instword & PPC_INST_MFSPR_DSCR_MASK) == - PPC_INST_MFSPR_DSCR)) && + if (((instword & PPC_INST_MFSPR_DSCR_MASK) == PPC_INST_MFSPR_DSCR) && cpu_has_feature(CPU_FTR_DSCR)) { PPC_WARN_EMULATED(mfdscr, regs); rd = (instword >> 21) & 0x1f; @@ -979,10 +976,7 @@ static int emulate_instruction(struct pt_regs *regs) return 0; } /* Emulate the mtspr DSCR, rD. */ - if ((((instword & PPC_INST_MTSPR_DSCR_USER_MASK) == - PPC_INST_MTSPR_DSCR_USER) || - ((instword & PPC_INST_MTSPR_DSCR_MASK) == - PPC_INST_MTSPR_DSCR)) && + if (((instword & PPC_INST_MTSPR_DSCR_MASK) == PPC_INST_MTSPR_DSCR) && cpu_has_feature(CPU_FTR_DSCR)) { PPC_WARN_EMULATED(mtdscr, regs); rd = (instword >> 21) & 0x1f; |