[PATCH 7/14] mips: replace timespectojiffies() with timespec_to_jiffies()
From: Nishanth Aravamudan <hidden>
Date: 2005-07-09 00:11:27
Also in:
kernel-janitors
From: Nishanth Aravamudan <redacted> Description: Replace custom timespectojiffies() function with generic standard one. Signed-off-by: Nishanth Aravamudan <redacted> --- irixsig.c | 14 +------------- 1 files changed, 1 insertion(+), 13 deletions(-) diff -urp 2.6.13-rc2-kj/arch/mips/kernel/irixsig.c 2.6.13-rc2-kj-dev/arch/mips/kernel/irixsig.c
--- 2.6.13-rc2-kj/arch/mips/kernel/irixsig.c 2005-07-06 07:57:02.000000000 -0700
+++ 2.6.13-rc2-kj-dev/arch/mips/kernel/irixsig.c 2005-07-06 13:30:34.000000000 -0700@@ -441,18 +441,6 @@ struct irix5_siginfo { } 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 *set, struct irix5_siginfo *info, struct timespec *tp) {
@@ -490,7 +478,7 @@ asmlinkage int irix_sigpoll_sys(unsigned error = -EINVAL; goto out; } - expire = timespectojiffies(tp)+(tp->tv_sec||tp->tv_nsec); + expire = timespec_to_jiffies(tp)+(tp->tv_sec||tp->tv_nsec); } while(1) {