patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / alpha / math-emu / math.c

diff --git a/arch/alpha/math-emu/math.c b/arch/alpha/math-emu/math.c
index 28ad144..ae79dd9 100644 (file)
--- a/arch/alpha/math-emu/math.c
+++ b/arch/alpha/math-emu/math.c
@@ -106,9 +106,7 @@ alpha_fp_emul (unsigned long pc)
        __u32 insn;
        long si_code;
 
-       MOD_INC_USE_COUNT;
-
-       get_user(insn, (__u32*)pc);
+       get_user(insn, (__u32 __user *)pc);
        fc     = (insn >>  0) & 0x1f;   /* destination register */
        fb     = (insn >> 16) & 0x1f;
        fa     = (insn >> 21) & 0x1f;
@@ -173,7 +171,7 @@ alpha_fp_emul (unsigned long pc)
                                        _FP_FRAC_SET_1(DB, _FP_ZEROFRAC_1);
                        }
                        FP_CMP_D(res, DA, DB, 3);
-                       vc = 0x4000000000000000;
+                       vc = 0x4000000000000000UL;
                        /* CMPTEQ, CMPTUN don't trap on QNaN,
                           while CMPTLT and CMPTLE do */
                        if (res == 3
@@ -320,7 +318,6 @@ done:
                        if (_fex & IEEE_TRAP_ENABLE_INV) si_code = FPE_FLTINV;
                }
 
-               MOD_DEC_USE_COUNT;
                return si_code;
        }
 
@@ -328,13 +325,11 @@ done:
           requires that the result *always* be written... so we do the write
           immediately after the operations above.  */
 
-       MOD_DEC_USE_COUNT;
        return 0;
 
 bad_insn:
        printk(KERN_ERR "alpha_fp_emul: Invalid FP insn %#x at %#lx\n",
               insn, pc);
-       MOD_DEC_USE_COUNT;
        return -1;
 }
 
@@ -344,8 +339,6 @@ alpha_fp_emul_imprecise (struct pt_regs *regs, unsigned long write_mask)
        unsigned long trigger_pc = regs->pc - 4;
        unsigned long insn, opcode, rc, si_code = 0;
 
-       MOD_INC_USE_COUNT;
-
        /*
         * Turn off the bits corresponding to registers that are the
         * target of instructions that set bits in the exception
@@ -358,7 +351,7 @@ alpha_fp_emul_imprecise (struct pt_regs *regs, unsigned long write_mask)
         * up to the first occurrence of such an instruction.
         */
        while (write_mask) {
-               get_user(insn, (__u32*)(trigger_pc));
+               get_user(insn, (__u32 __user *)(trigger_pc));
                opcode = insn >> 26;
                rc = insn & 0x1f;
 
@@ -403,6 +396,5 @@ alpha_fp_emul_imprecise (struct pt_regs *regs, unsigned long write_mask)
        }
 
 egress:
-       MOD_DEC_USE_COUNT;
        return si_code;
 }