1 files changed, 6 insertions, 6 deletions

diff --git a/arch/mips/kernel/mips-r2-to-r6-emul.c b/arch/mips/kernel/mips-r2-to-r6-emul.c
index ef2ca28a028b..d8f1cf1ec370 100644
--- a/arch/mips/kernel/mips-r2-to-r6-emul.c
+++ b/arch/mips/kernel/mips-r2-to-r6-emul.c
@@ -433,8 +433,8 @@ static int multu_func(struct pt_regs *regs, u32 ir)
         rs = regs->regs[MIPSInst_RS(ir)];
         res = (u64)rt * (u64)rs;
         rt = res;
-        regs->lo = (s64)rt;
-        regs->hi = (s64)(res >> 32);
+        regs->lo = (s64)(s32)rt;
+        regs->hi = (s64)(s32)(res >> 32);
 
         MIPS_R2_STATS(muls);
 
@@ -670,9 +670,9 @@ static int maddu_func(struct pt_regs *regs, u32 ir)
         res += ((((s64)rt) << 32) | (u32)rs);
 
         rt = res;
-        regs->lo = (s64)rt;
+        regs->lo = (s64)(s32)rt;
         rs = res >> 32;
-        regs->hi = (s64)rs;
+        regs->hi = (s64)(s32)rs;
 
         MIPS_R2_STATS(dsps);
 
@@ -728,9 +728,9 @@ static int msubu_func(struct pt_regs *regs, u32 ir)
         res = ((((s64)rt) << 32) | (u32)rs) - res;
 
         rt = res;
-        regs->lo = (s64)rt;
+        regs->lo = (s64)(s32)rt;
         rs = res >> 32;
-        regs->hi = (s64)rs;
+        regs->hi = (s64)(s32)rs;
 
         MIPS_R2_STATS(dsps);