2 files changed, 12 insertions, 2 deletions

diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h
index 0c34e4803499..eccfc161e58e 100644
--- a/arch/powerpc/include/asm/ppc-opcode.h
+++ b/arch/powerpc/include/asm/ppc-opcode.h
@@ -115,6 +115,10 @@
 #define PPC_INST_MFSPR_DSCR_MASK        0xfc1fffff
 #define PPC_INST_MTSPR_DSCR             0x7c1103a6
 #define PPC_INST_MTSPR_DSCR_MASK        0xfc1fffff
+#define PPC_INST_MFSPR_DSCR_USER        0x7c0302a6
+#define PPC_INST_MFSPR_DSCR_USER_MASK   0xfc1fffff
+#define PPC_INST_MTSPR_DSCR_USER        0x7c0303a6
+#define PPC_INST_MTSPR_DSCR_USER_MASK   0xfc1fffff
 #define PPC_INST_SLBFEE                 0x7c0007a7
 
 #define PPC_INST_STRING                 0x7c00042a
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 37cc40ef5043..83efa2f7d926 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -970,7 +970,10 @@ static int emulate_instruction(struct pt_regs *regs)
 
 #ifdef CONFIG_PPC64
         /* Emulate the mfspr rD, DSCR. */
-        if (((instword & PPC_INST_MFSPR_DSCR_MASK) == PPC_INST_MFSPR_DSCR) &&
+        if ((((instword & PPC_INST_MFSPR_DSCR_USER_MASK) ==
+                PPC_INST_MFSPR_DSCR_USER) ||
+             ((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;
@@ -978,7 +981,10 @@ static int emulate_instruction(struct pt_regs *regs)
                 return 0;
         }
         /* Emulate the mtspr DSCR, rD. */
-        if (((instword & PPC_INST_MTSPR_DSCR_MASK) == PPC_INST_MTSPR_DSCR) &&
+        if ((((instword & PPC_INST_MTSPR_DSCR_USER_MASK) ==
+                PPC_INST_MTSPR_DSCR_USER) ||
+             ((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;