linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / mips / kernel / sysirix.c

diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c
index a456f78..fc36083 100644 (file)
--- a/arch/mips/kernel/sysirix.c
+++ b/arch/mips/kernel/sysirix.c
@@ -646,7 +646,27 @@ static inline void getitimer_real(struct itimerval *value)
 
 asmlinkage unsigned int irix_alarm(unsigned int seconds)
 {
-       return alarm_setitimer(seconds);
+       struct itimerval it_new, it_old;
+       unsigned int oldalarm;
+
+       if (!seconds) {
+               getitimer_real(&it_old);
+               del_timer(&current->real_timer);
+       } else {
+               it_new.it_interval.tv_sec = it_new.it_interval.tv_usec = 0;
+               it_new.it_value.tv_sec = seconds;
+               it_new.it_value.tv_usec = 0;
+               do_setitimer(ITIMER_REAL, &it_new, &it_old);
+       }
+       oldalarm = it_old.it_value.tv_sec;
+       /*
+        * ehhh.. We can't return 0 if we have an alarm pending ...
+        * And we'd better return too much than too little anyway
+        */
+       if (it_old.it_value.tv_usec)
+               oldalarm++;
+
+       return oldalarm;
 }
 
 asmlinkage int irix_pause(void)