patch-1.3.16 linux/kernel/sched.c

• Lines: 20
• Date: Mon Aug 7 11:00:44 1995
• Orig file: v1.3.15/linux/kernel/sched.c
• Orig date: Wed Aug 2 13:21:17 1995

diff -u --recursive --new-file v1.3.15/linux/kernel/sched.c linux/kernel/sched.c
@@ -716,12 +716,18 @@
 asmlinkage unsigned int sys_alarm(unsigned int seconds)
 {
 	struct itimerval it_new, it_old;
+	unsigned int oldalarm;
 
 	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;
 	_setitimer(ITIMER_REAL, &it_new, &it_old);
-	return(it_old.it_value.tv_sec + (it_old.it_value.tv_usec / 1000000));
+	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 sys_getpid(void)