MIPS: Fix MFC1 & MFHC1 emulation for 64-bit MIPS systems

[deliverable/linux.git] / arch / mips / math-emu / cp1emu.c

diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
index bf0fc6b16ad9487648c0e38f945db0fd7f5461d6..7a4727795a707764fda6014bf5db92d06e63052d 100644 (file)
--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
@@ -650,9 +650,9 @@ static inline int cop1_64bit(struct pt_regs *xcp)
 #define SIFROMREG(si, x)                                               \
 do {                                                                   \
        if (cop1_64bit(xcp))                                            \
-               (si) = get_fpr32(&ctx->fpr[x], 0);                      \
+               (si) = (int)get_fpr32(&ctx->fpr[x], 0);                 \
        else                                                            \
-               (si) = get_fpr32(&ctx->fpr[(x) & ~1], (x) & 1);         \
+               (si) = (int)get_fpr32(&ctx->fpr[(x) & ~1], (x) & 1);    \
 } while (0)
 
 #define SITOREG(si, x)                                                 \
@@ -667,7 +667,7 @@ do {                                                                        \
        }                                                               \
 } while (0)
 
-#define SIFROMHREG(si, x)      ((si) = get_fpr32(&ctx->fpr[x], 1))
+#define SIFROMHREG(si, x)      ((si) = (int)get_fpr32(&ctx->fpr[x], 1))
 
 #define SITOHREG(si, x)                                                        \
 do {                                                                   \