diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 4a0db6adfa31..797ea2caec70 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$
+ * $Id: kern_time.c,v 1.21 1997/02/22 09:39:13 peter Exp $
  */
 
 #include <sys/param.h>
@@ -267,8 +267,7 @@ getitimer(p, uap, retval)
 			if (timercmp(&aitv.it_value, &time, <))
 				timerclear(&aitv.it_value);
 			else
-				timevalsub(&aitv.it_value,
-				    (struct timeval *)&time);
+				timevalsub(&aitv.it_value, &time);
 	} else
 		aitv = p->p_stats->p_timer[uap->which];
 	splx(s);
@@ -310,7 +309,7 @@ setitimer(p, uap, retval)
 	if (uap->which == ITIMER_REAL) {
 		untimeout(realitexpire, (caddr_t)p);
 		if (timerisset(&aitv.it_value)) {
-			timevaladd(&aitv.it_value, (struct timeval *)&time);
+			timevaladd(&aitv.it_value, &time);
 			timeout(realitexpire, (caddr_t)p, hzto(&aitv.it_value));
 		}
 		p->p_realtimer = aitv;
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 9e40e0de2521..67ac7c593047 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_generic.c	8.5 (Berkeley) 1/21/94
- * $Id$
+ * $Id: sys_generic.c,v 1.23 1997/02/22 09:39:19 peter Exp $
  */
 
 #include "opt_ktrace.h"
@@ -598,7 +598,7 @@ select(p, uap, retval)
 			goto done;
 		}
 		s = splclock();
-		timevaladd(&atv, (struct timeval *)&time);
+		timevaladd(&atv, &time);
 		timo = hzto(&atv);
 		/*
 		 * Avoid inadvertently sleeping forever.
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index 65177fb55ba6..fa56797c2407 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $Id$
+ * $Id: kernel.h,v 1.25 1997/02/22 09:45:25 peter Exp $
  */
 
 #ifndef _SYS_KERNEL_H_
@@ -60,7 +60,7 @@ extern char kernelname[MAXPATHLEN];
 extern volatile struct timeval mono_time;
 extern struct timeval boottime;
 extern struct timeval runtime;
-extern volatile struct timeval time;
+extern struct timeval time;		/* nonvolatile at ipl >= splclock() */
 extern struct timezone tz;			/* XXX */
 
 extern int tick;			/* usec per tick (1000000 / hz) */
diff --git a/sys/ufs/lfs/lfs_syscalls.c b/sys/ufs/lfs/lfs_syscalls.c
index 273ddb42dde3..feb484b74a3b 100644
--- a/sys/ufs/lfs/lfs_syscalls.c
+++ b/sys/ufs/lfs/lfs_syscalls.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_syscalls.c	8.5 (Berkeley) 4/20/94
- * $Id$
+ * $Id: lfs_syscalls.c,v 1.17 1997/02/22 09:47:24 peter Exp $
  */
 
 #include <sys/param.h>
@@ -432,7 +432,7 @@ lfs_segwait(p, uap, retval)
 		if (itimerfix(&atv))
 			return (EINVAL);
 		s = splclock();
-		timevaladd(&atv, (struct timeval *)&time);
+		timevaladd(&atv, &time);
 		timeout = hzto(&atv);
 		splx(s);
 	} else