diff options
| author | Scott Wood <scottwood@freescale.com> | 2013-10-29 20:03:43 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-10-29 20:03:43 (GMT) |
| commit | ae60d5d27c429b13cf28a09ab8b9d30682433c5a (patch) | |
| tree | 16b67511ef66b0580c267a5438d1face3a3778e6 /arch/powerpc/kernel/traps.c | |
| parent | b095c5c2577aeedce2db847fa117596628d4e7cb (diff) | |
| parent | d0ebef8230e267ec47d4d4a65fe3262e2ebb8026 (diff) | |
| download | linux-fsl-qoriq-ae60d5d27c429b13cf28a09ab8b9d30682433c5a.tar.xz | |
Revert to 3.8 (no rt, no stable)
This is a merge from rtmerge, which has been similarly reverted.
Conflicts:
drivers/crypto/caam/caamalg.c
drivers/misc/Makefile
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; |