CVS Update@linux-mips.org: linux

[ralf@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/07/11 15:11:05

Modified files:
        arch/mips/kernel: irixsig.c 

Log message:
        Replace custom timespectojiffies() function with generic
        timespec_to_jiffies.

diff -urN linux/arch/mips/kernel/irixsig.c linux/arch/mips/kernel/irixsig.c
--- linux/arch/mips/kernel/irixsig.c    2005/03/17 21:50:49     1.47
+++ linux/arch/mips/kernel/irixsig.c    2005/07/11 14:11:05     1.48
@@ -461,18 +461,6 @@
        } stuff;
 };
 
-static inline unsigned long timespectojiffies(struct timespec *value)
-{
-       unsigned long sec = (unsigned) value->tv_sec;
-       long nsec = value->tv_nsec;
-
-       if (sec > (LONG_MAX / HZ))
-               return LONG_MAX;
-       nsec += 1000000000L / HZ - 1;
-       nsec /= 1000000000L / HZ;
-       return HZ * sec + nsec;
-}
-
 asmlinkage int irix_sigpoll_sys(unsigned long __user *set,
        struct irix5_siginfo __user *info, struct timespec __user *tp)
 {
@@ -505,7 +493,8 @@
                if (!ktp.tv_sec && !ktp.tv_nsec)
                        return -EINVAL;
 
-               expire = timespectojiffies(&ktp) + (ktp.tv_sec || ktp.tv_nsec);
+               expire = timespec_to_jiffies(&ktp) +
+                        (ktp.tv_sec || ktp.tv_nsec);
        }
 
        while(1) {