16 files changed, 98 insertions, 86 deletions

diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 6657ae48dac8..d6580022d3e9 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.70 1998/03/07 20:16:49 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.71 1998/04/01 21:07:35 tegge Exp $
  */
 
 #include "opt_smp.h"
@@ -2450,12 +2450,12 @@ forward_hardclock(int pscnt)
 		if (p) {
 			pstats = p->p_stats;
 			if (checkstate_cpustate[id] == CHECKSTATE_USER &&
-			    timerisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
+			    timevalisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
 			    itimerdecr(&pstats->p_timer[ITIMER_VIRTUAL], tick) == 0) {
 				psignal(p, SIGVTALRM);
 				map |= (1 << id);
 			}
-			if (timerisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
+			if (timevalisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
 			    itimerdecr(&pstats->p_timer[ITIMER_PROF], tick) == 0) {
 				psignal(p, SIGPROF);
 				map |= (1 << id);
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index 6657ae48dac8..d6580022d3e9 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.70 1998/03/07 20:16:49 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.71 1998/04/01 21:07:35 tegge Exp $
  */
 
 #include "opt_smp.h"
@@ -2450,12 +2450,12 @@ forward_hardclock(int pscnt)
 		if (p) {
 			pstats = p->p_stats;
 			if (checkstate_cpustate[id] == CHECKSTATE_USER &&
-			    timerisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
+			    timevalisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
 			    itimerdecr(&pstats->p_timer[ITIMER_VIRTUAL], tick) == 0) {
 				psignal(p, SIGVTALRM);
 				map |= (1 << id);
 			}
-			if (timerisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
+			if (timevalisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
 			    itimerdecr(&pstats->p_timer[ITIMER_PROF], tick) == 0) {
 				psignal(p, SIGPROF);
 				map |= (1 << id);
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index 6657ae48dac8..d6580022d3e9 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.70 1998/03/07 20:16:49 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.71 1998/04/01 21:07:35 tegge Exp $
  */
 
 #include "opt_smp.h"
@@ -2450,12 +2450,12 @@ forward_hardclock(int pscnt)
 		if (p) {
 			pstats = p->p_stats;
 			if (checkstate_cpustate[id] == CHECKSTATE_USER &&
-			    timerisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
+			    timevalisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
 			    itimerdecr(&pstats->p_timer[ITIMER_VIRTUAL], tick) == 0) {
 				psignal(p, SIGVTALRM);
 				map |= (1 << id);
 			}
-			if (timerisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
+			if (timevalisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
 			    itimerdecr(&pstats->p_timer[ITIMER_PROF], tick) == 0) {
 				psignal(p, SIGPROF);
 				map |= (1 << id);
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 0a6277a52e7b..d2e17d4f8cee 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_misc.c,v 1.35 1998/03/30 09:49:34 phk Exp $
+ *  $Id: linux_misc.c,v 1.36 1998/04/04 18:56:54 phk Exp $
  */
 
 #include <sys/param.h>
@@ -76,19 +76,19 @@ linux_alarm(struct proc *p, struct linux_alarm_args *args)
     s = splclock(); /* XXX Still needed ? */
     old_it = p->p_realtimer;
     getmicrotime(&tv);
-    if (timerisset(&old_it.it_value))
-	if (timercmp(&old_it.it_value, &tv, <))
-	    timerclear(&old_it.it_value);
+    if (timevalisset(&old_it.it_value))
+	if (timevalcmp(&old_it.it_value, &tv, <))
+	    timevalclear(&old_it.it_value);
 	else
 	    timevalsub(&old_it.it_value, &tv);
     splx(s);
     if (itimerfix(&it.it_value) || itimerfix(&it.it_interval))
 	return EINVAL;
     s = splclock(); /* XXX Still needed ? */
-    if (timerisset(&p->p_realtimer.it_value))
+    if (timevalisset(&p->p_realtimer.it_value))
 	    untimeout(realitexpire, (caddr_t)p, p->p_ithandle);
     getmicrotime(&tv);
-    if (timerisset(&it.it_value)) {
+    if (timevalisset(&it.it_value)) {
 	timevaladd(&it.it_value, &tv);
 	p->p_ithandle = timeout(realitexpire, (caddr_t)p, hzto(&it.it_value));
     }
@@ -476,7 +476,7 @@ linux_newselect(struct proc *p, struct linux_newselect_args *args)
 		utv.tv_usec += 1000000;
 	    }
 	    if (utv.tv_sec < 0)
-		timerclear(&utv);
+		timevalclear(&utv);
 	    if ((error = copyout(&utv, tvp, sizeof(utv))))
 		goto select_out;
 	    bsa.tv = tvp;
@@ -512,9 +512,9 @@ linux_newselect(struct proc *p, struct linux_newselect_args *args)
 	    timevalsub(&tv1, &tv0);
 	    timevalsub(&utv, &tv1);
 	    if (utv.tv_sec < 0)
-		timerclear(&utv);
+		timevalclear(&utv);
 	} else
-	    timerclear(&utv);
+	    timevalclear(&utv);
 #ifdef DEBUG
 	printf("Linux-emul(%d): outgoing timeout (%d/%d)\n",
 	       p->p_pid, utv.tv_sec, utv.tv_usec);
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 6657ae48dac8..d6580022d3e9 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.70 1998/03/07 20:16:49 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.71 1998/04/01 21:07:35 tegge Exp $
  */
 
 #include "opt_smp.h"
@@ -2450,12 +2450,12 @@ forward_hardclock(int pscnt)
 		if (p) {
 			pstats = p->p_stats;
 			if (checkstate_cpustate[id] == CHECKSTATE_USER &&
-			    timerisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
+			    timevalisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
 			    itimerdecr(&pstats->p_timer[ITIMER_VIRTUAL], tick) == 0) {
 				psignal(p, SIGVTALRM);
 				map |= (1 << id);
 			}
-			if (timerisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
+			if (timevalisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
 			    itimerdecr(&pstats->p_timer[ITIMER_PROF], tick) == 0) {
 				psignal(p, SIGPROF);
 				map |= (1 << id);
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index 6657ae48dac8..d6580022d3e9 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.70 1998/03/07 20:16:49 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.71 1998/04/01 21:07:35 tegge Exp $
  */
 
 #include "opt_smp.h"
@@ -2450,12 +2450,12 @@ forward_hardclock(int pscnt)
 		if (p) {
 			pstats = p->p_stats;
 			if (checkstate_cpustate[id] == CHECKSTATE_USER &&
-			    timerisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
+			    timevalisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
 			    itimerdecr(&pstats->p_timer[ITIMER_VIRTUAL], tick) == 0) {
 				psignal(p, SIGVTALRM);
 				map |= (1 << id);
 			}
-			if (timerisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
+			if (timevalisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
 			    itimerdecr(&pstats->p_timer[ITIMER_PROF], tick) == 0) {
 				psignal(p, SIGPROF);
 				map |= (1 << id);
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index 1a018257fa71..a2c2db9e2290 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -45,7 +45,7 @@
  *
  *	@(#)sun_misc.c	8.1 (Berkeley) 6/18/93
  *
- * $Id: ibcs2_misc.c,v 1.24 1997/11/06 19:28:33 phk Exp $
+ * $Id: ibcs2_misc.c,v 1.25 1997/12/05 19:55:36 bde Exp $
  */
 
 /*
@@ -818,7 +818,7 @@ ibcs2_alarm(p, uap)
 
         itp = stackgap_alloc(&sg, sizeof(*itp));
 	oitp = stackgap_alloc(&sg, sizeof(*oitp));
-        timerclear(&itp->it_interval);
+        timevalclear(&itp->it_interval);
         itp->it_value.tv_sec = SCARG(uap, sec);
         itp->it_value.tv_usec = 0;
 
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index 6657ae48dac8..d6580022d3e9 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.70 1998/03/07 20:16:49 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.71 1998/04/01 21:07:35 tegge Exp $
  */
 
 #include "opt_smp.h"
@@ -2450,12 +2450,12 @@ forward_hardclock(int pscnt)
 		if (p) {
 			pstats = p->p_stats;
 			if (checkstate_cpustate[id] == CHECKSTATE_USER &&
-			    timerisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
+			    timevalisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
 			    itimerdecr(&pstats->p_timer[ITIMER_VIRTUAL], tick) == 0) {
 				psignal(p, SIGVTALRM);
 				map |= (1 << id);
 			}
-			if (timerisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
+			if (timevalisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
 			    itimerdecr(&pstats->p_timer[ITIMER_PROF], tick) == 0) {
 				psignal(p, SIGPROF);
 				map |= (1 << id);
diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c
index 0a6277a52e7b..d2e17d4f8cee 100644
--- a/sys/i386/linux/linux_misc.c
+++ b/sys/i386/linux/linux_misc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_misc.c,v 1.35 1998/03/30 09:49:34 phk Exp $
+ *  $Id: linux_misc.c,v 1.36 1998/04/04 18:56:54 phk Exp $
  */
 
 #include <sys/param.h>
@@ -76,19 +76,19 @@ linux_alarm(struct proc *p, struct linux_alarm_args *args)
     s = splclock(); /* XXX Still needed ? */
     old_it = p->p_realtimer;
     getmicrotime(&tv);
-    if (timerisset(&old_it.it_value))
-	if (timercmp(&old_it.it_value, &tv, <))
-	    timerclear(&old_it.it_value);
+    if (timevalisset(&old_it.it_value))
+	if (timevalcmp(&old_it.it_value, &tv, <))
+	    timevalclear(&old_it.it_value);
 	else
 	    timevalsub(&old_it.it_value, &tv);
     splx(s);
     if (itimerfix(&it.it_value) || itimerfix(&it.it_interval))
 	return EINVAL;
     s = splclock(); /* XXX Still needed ? */
-    if (timerisset(&p->p_realtimer.it_value))
+    if (timevalisset(&p->p_realtimer.it_value))
 	    untimeout(realitexpire, (caddr_t)p, p->p_ithandle);
     getmicrotime(&tv);
-    if (timerisset(&it.it_value)) {
+    if (timevalisset(&it.it_value)) {
 	timevaladd(&it.it_value, &tv);
 	p->p_ithandle = timeout(realitexpire, (caddr_t)p, hzto(&it.it_value));
     }
@@ -476,7 +476,7 @@ linux_newselect(struct proc *p, struct linux_newselect_args *args)
 		utv.tv_usec += 1000000;
 	    }
 	    if (utv.tv_sec < 0)
-		timerclear(&utv);
+		timevalclear(&utv);
 	    if ((error = copyout(&utv, tvp, sizeof(utv))))
 		goto select_out;
 	    bsa.tv = tvp;
@@ -512,9 +512,9 @@ linux_newselect(struct proc *p, struct linux_newselect_args *args)
 	    timevalsub(&tv1, &tv0);
 	    timevalsub(&utv, &tv1);
 	    if (utv.tv_sec < 0)
-		timerclear(&utv);
+		timevalclear(&utv);
 	} else
-	    timerclear(&utv);
+	    timevalclear(&utv);
 #ifdef DEBUG
 	printf("Linux-emul(%d): outgoing timeout (%d/%d)\n",
 	       p->p_pid, utv.tv_sec, utv.tv_usec);
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index a22da2bd15d1..13195c3cd869 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -39,7 +39,7 @@ static volatile int print_tci = 1;
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.64 1998/04/04 18:46:09 phk Exp $
+ * $Id: kern_clock.c,v 1.65 1998/04/05 11:49:34 phk Exp $
  */
 
 #include <sys/param.h>
@@ -182,10 +182,10 @@ hardclock(frame)
 		 */
 		pstats = p->p_stats;
 		if (CLKF_USERMODE(frame) &&
-		    timerisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
+		    timevalisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
 		    itimerdecr(&pstats->p_timer[ITIMER_VIRTUAL], tick) == 0)
 			psignal(p, SIGVTALRM);
-		if (timerisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
+		if (timevalisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
 		    itimerdecr(&pstats->p_timer[ITIMER_PROF], tick) == 0)
 			psignal(p, SIGPROF);
 	}
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 48e9abcd15a2..7d0768b58ac5 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
- * $Id: kern_exit.c,v 1.64 1997/12/16 17:40:14 eivind Exp $
+ * $Id: kern_exit.c,v 1.65 1998/01/22 17:29:45 dyson Exp $
  */
 
 #include "opt_compat.h"
@@ -182,7 +182,7 @@ exit1(p, rv)
 	p->p_flag |= P_WEXIT;
 	p->p_sigignore = ~0;
 	p->p_siglist = 0;
-	if (timerisset(&p->p_realtimer.it_value))
+	if (timevalisset(&p->p_realtimer.it_value))
 		untimeout(realitexpire, (caddr_t)p, p->p_ithandle);
 
 	/*
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index a22da2bd15d1..13195c3cd869 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -39,7 +39,7 @@ static volatile int print_tci = 1;
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.64 1998/04/04 18:46:09 phk Exp $
+ * $Id: kern_clock.c,v 1.65 1998/04/05 11:49:34 phk Exp $
  */
 
 #include <sys/param.h>
@@ -182,10 +182,10 @@ hardclock(frame)
 		 */
 		pstats = p->p_stats;
 		if (CLKF_USERMODE(frame) &&
-		    timerisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
+		    timevalisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
 		    itimerdecr(&pstats->p_timer[ITIMER_VIRTUAL], tick) == 0)
 			psignal(p, SIGVTALRM);
-		if (timerisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
+		if (timevalisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
 		    itimerdecr(&pstats->p_timer[ITIMER_PROF], tick) == 0)
 			psignal(p, SIGPROF);
 	}
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 452e0e024c62..00d65c8ec94a 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_time.c	8.1 (Berkeley) 6/10/93
- * $Id: kern_time.c,v 1.50 1998/04/05 11:49:36 phk Exp $
+ * $Id: kern_time.c,v 1.51 1998/04/05 12:10:41 phk Exp $
  */
 
 #include <sys/param.h>
@@ -474,10 +474,10 @@ getitimer(p, uap)
 		 * current time and time for the timer to go off.
 		 */
 		aitv = p->p_realtimer;
-		if (timerisset(&aitv.it_value)) {
+		if (timevalisset(&aitv.it_value)) {
 			getmicroruntime(&ctv);
-			if (timercmp(&aitv.it_value, &ctv, <))
-				timerclear(&aitv.it_value);
+			if (timevalcmp(&aitv.it_value, &ctv, <))
+				timevalclear(&aitv.it_value);
 			else
 				timevalsub(&aitv.it_value, &ctv);
 		}
@@ -518,15 +518,15 @@ setitimer(p, uap)
 		return (0);
 	if (itimerfix(&aitv.it_value))
 		return (EINVAL);
-	if (!timerisset(&aitv.it_value))
-		timerclear(&aitv.it_interval);
+	if (!timevalisset(&aitv.it_value))
+		timevalclear(&aitv.it_interval);
 	else if (itimerfix(&aitv.it_interval))
 		return (EINVAL);
 	s = splclock(); /* XXX: still needed ? */
 	if (uap->which == ITIMER_REAL) {
-		if (timerisset(&p->p_realtimer.it_value))
+		if (timevalisset(&p->p_realtimer.it_value))
 			untimeout(realitexpire, (caddr_t)p, p->p_ithandle);
-		if (timerisset(&aitv.it_value)) 
+		if (timevalisset(&aitv.it_value)) 
 			p->p_ithandle = timeout(realitexpire, (caddr_t)p,
 						tvtohz(&aitv.it_value));
 		getmicroruntime(&ctv);
@@ -560,8 +560,8 @@ realitexpire(arg)
 
 	p = (struct proc *)arg;
 	psignal(p, SIGALRM);
-	if (!timerisset(&p->p_realtimer.it_interval)) {
-		timerclear(&p->p_realtimer.it_value);
+	if (!timevalisset(&p->p_realtimer.it_interval)) {
+		timevalclear(&p->p_realtimer.it_value);
 		return;
 	}
 	for (;;) {
@@ -569,7 +569,7 @@ realitexpire(arg)
 		timevaladd(&p->p_realtimer.it_value,
 		    &p->p_realtimer.it_interval);
 		getmicroruntime(&ctv);
-		if (timercmp(&p->p_realtimer.it_value, &ctv, >)) {
+		if (timevalcmp(&p->p_realtimer.it_value, &ctv, >)) {
 			ntv = p->p_realtimer.it_value;
 			timevalsub(&ntv, &ctv);
 			p->p_ithandle =
@@ -627,11 +627,11 @@ itimerdecr(itp, usec)
 	}
 	itp->it_value.tv_usec -= usec;
 	usec = 0;
-	if (timerisset(&itp->it_value))
+	if (timevalisset(&itp->it_value))
 		return (1);
 	/* expired, exactly at end of interval */
 expire:
-	if (timerisset(&itp->it_interval)) {
+	if (timevalisset(&itp->it_interval)) {
 		itp->it_value = itp->it_interval;
 		itp->it_value.tv_usec -= usec;
 		if (itp->it_value.tv_usec < 0) {
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 6657ae48dac8..d6580022d3e9 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.70 1998/03/07 20:16:49 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.71 1998/04/01 21:07:35 tegge Exp $
  */
 
 #include "opt_smp.h"
@@ -2450,12 +2450,12 @@ forward_hardclock(int pscnt)
 		if (p) {
 			pstats = p->p_stats;
 			if (checkstate_cpustate[id] == CHECKSTATE_USER &&
-			    timerisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
+			    timevalisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) &&
 			    itimerdecr(&pstats->p_timer[ITIMER_VIRTUAL], tick) == 0) {
 				psignal(p, SIGVTALRM);
 				map |= (1 << id);
 			}
-			if (timerisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
+			if (timevalisset(&pstats->p_timer[ITIMER_PROF].it_value) &&
 			    itimerdecr(&pstats->p_timer[ITIMER_PROF], tick) == 0) {
 				psignal(p, SIGPROF);
 				map |= (1 << id);
diff --git a/sys/sys/time.h b/sys/sys/time.h
index 6d5a80336cd5..1a8515add0f9 100644
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * $Id: time.h,v 1.22 1998/03/30 09:55:35 phk Exp $
+ * $Id: time.h,v 1.23 1998/04/04 13:26:16 phk Exp $
  */
 
 #ifndef _SYS_TIME_H_
@@ -156,6 +156,7 @@ struct timecounter {
 };
 
 #ifdef KERNEL
+
 /* Operations on timespecs */
 #define	timespecclear(tvp)	(tvp)->tv_sec = (tvp)->tv_nsec = 0
 #define	timespecisset(tvp)	((tvp)->tv_sec || (tvp)->tv_nsec)
@@ -163,40 +164,46 @@ struct timecounter {
 	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
 	    ((tvp)->tv_nsec cmp (uvp)->tv_nsec) :			\
 	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
-#define timespecadd(vvp, uvp)					\
+#define timespecadd(vvp, uvp)						\
 	do {								\
-		(vvp)->tv_sec += (uvp)->tv_sec;		\
-		(vvp)->tv_nsec += (uvp)->tv_nsec;	\
+		(vvp)->tv_sec += (uvp)->tv_sec;				\
+		(vvp)->tv_nsec += (uvp)->tv_nsec;			\
 		if ((vvp)->tv_nsec >= 1000000000) {			\
 			(vvp)->tv_sec++;				\
 			(vvp)->tv_nsec -= 1000000000;			\
 		}							\
 	} while (0)
-#define timespecsub(vvp, uvp)					\
+#define timespecsub(vvp, uvp)						\
 	do {								\
-		(vvp)->tv_sec -= (uvp)->tv_sec;		\
-		(vvp)->tv_nsec -= (uvp)->tv_nsec;	\
+		(vvp)->tv_sec -= (uvp)->tv_sec;				\
+		(vvp)->tv_nsec -= (uvp)->tv_nsec;			\
 		if ((vvp)->tv_nsec < 0) {				\
 			(vvp)->tv_sec--;				\
 			(vvp)->tv_nsec += 1000000000;			\
 		}							\
 	} while (0)
+
 /* Operations on timevals. */
+
+#define	timevalclear(tvp)		(tvp)->tv_sec = (tvp)->tv_usec = 0
+#define	timevalisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
 #define	timevalcmp(tvp, uvp, cmp)					\
 	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
 	    ((tvp)->tv_usec cmp (uvp)->tv_usec) :			\
 	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
+
+/* timevaladd and timevalsub are not inlined */
+
 #endif /* KERNEL */
 
-/* Operations on timevals. */
+#ifndef KERNEL			/* NetBSD/OpenBSD compatable interfaces */
+
 #define	timerclear(tvp)		(tvp)->tv_sec = (tvp)->tv_usec = 0
 #define	timerisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
-#define	timercmp(tvp, uvp, cmp)						\
+#define	timercmp(tvp, uvp, cmp)					\
 	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
 	    ((tvp)->tv_usec cmp (uvp)->tv_usec) :			\
 	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
-#ifndef KERNEL		/* use timevaladd/timevalsub in kernel */
-/* NetBSD/OpenBSD compatable interfaces */
 #define timeradd(tvp, uvp, vvp)						\
 	do {								\
 		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;		\
@@ -258,7 +265,6 @@ struct clockinfo {
 extern struct timecounter *timecounter;
 extern time_t	time_second;
 
-void	forward_timecounter __P((void));
 void	getmicroruntime __P((struct timeval *tv));
 void	getmicrotime __P((struct timeval *tv));
 void	getnanoruntime __P((struct timespec *tv));
diff --git a/sys/sys/timetc.h b/sys/sys/timetc.h
index 6d5a80336cd5..1a8515add0f9 100644
--- a/sys/sys/timetc.h
+++ b/sys/sys/timetc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * $Id: time.h,v 1.22 1998/03/30 09:55:35 phk Exp $
+ * $Id: time.h,v 1.23 1998/04/04 13:26:16 phk Exp $
  */
 
 #ifndef _SYS_TIME_H_
@@ -156,6 +156,7 @@ struct timecounter {
 };
 
 #ifdef KERNEL
+
 /* Operations on timespecs */
 #define	timespecclear(tvp)	(tvp)->tv_sec = (tvp)->tv_nsec = 0
 #define	timespecisset(tvp)	((tvp)->tv_sec || (tvp)->tv_nsec)
@@ -163,40 +164,46 @@ struct timecounter {
 	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
 	    ((tvp)->tv_nsec cmp (uvp)->tv_nsec) :			\
 	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
-#define timespecadd(vvp, uvp)					\
+#define timespecadd(vvp, uvp)						\
 	do {								\
-		(vvp)->tv_sec += (uvp)->tv_sec;		\
-		(vvp)->tv_nsec += (uvp)->tv_nsec;	\
+		(vvp)->tv_sec += (uvp)->tv_sec;				\
+		(vvp)->tv_nsec += (uvp)->tv_nsec;			\
 		if ((vvp)->tv_nsec >= 1000000000) {			\
 			(vvp)->tv_sec++;				\
 			(vvp)->tv_nsec -= 1000000000;			\
 		}							\
 	} while (0)
-#define timespecsub(vvp, uvp)					\
+#define timespecsub(vvp, uvp)						\
 	do {								\
-		(vvp)->tv_sec -= (uvp)->tv_sec;		\
-		(vvp)->tv_nsec -= (uvp)->tv_nsec;	\
+		(vvp)->tv_sec -= (uvp)->tv_sec;				\
+		(vvp)->tv_nsec -= (uvp)->tv_nsec;			\
 		if ((vvp)->tv_nsec < 0) {				\
 			(vvp)->tv_sec--;				\
 			(vvp)->tv_nsec += 1000000000;			\
 		}							\
 	} while (0)
+
 /* Operations on timevals. */
+
+#define	timevalclear(tvp)		(tvp)->tv_sec = (tvp)->tv_usec = 0
+#define	timevalisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
 #define	timevalcmp(tvp, uvp, cmp)					\
 	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
 	    ((tvp)->tv_usec cmp (uvp)->tv_usec) :			\
 	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
+
+/* timevaladd and timevalsub are not inlined */
+
 #endif /* KERNEL */
 
-/* Operations on timevals. */
+#ifndef KERNEL			/* NetBSD/OpenBSD compatable interfaces */
+
 #define	timerclear(tvp)		(tvp)->tv_sec = (tvp)->tv_usec = 0
 #define	timerisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
-#define	timercmp(tvp, uvp, cmp)						\
+#define	timercmp(tvp, uvp, cmp)					\
 	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
 	    ((tvp)->tv_usec cmp (uvp)->tv_usec) :			\
 	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
-#ifndef KERNEL		/* use timevaladd/timevalsub in kernel */
-/* NetBSD/OpenBSD compatable interfaces */
 #define timeradd(tvp, uvp, vvp)						\
 	do {								\
 		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;		\
@@ -258,7 +265,6 @@ struct clockinfo {
 extern struct timecounter *timecounter;
 extern time_t	time_second;
 
-void	forward_timecounter __P((void));
 void	getmicroruntime __P((struct timeval *tv));
 void	getmicrotime __P((struct timeval *tv));
 void	getnanoruntime __P((struct timespec *tv));