added my responsibility for the `cpm' port

[unix-history] / sys / kern / kern_time.c

diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index f613d64..c94d431 100644 (file)
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *     from: @(#)kern_time.c   7.15 (Berkeley) 3/17/91
  * SUCH DAMAGE.
  *
  *     from: @(#)kern_time.c   7.15 (Berkeley) 3/17/91

- *     $Id: kern_time.c,v 1.3 1993/10/16 15:24:33 rgrimes Exp $
+ *     $Id: kern_time.c,v 1.4 1993/11/25 01:33:14 wollman Exp $

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -103,7 +103,9 @@ settimeofday(p, uap, retval)
                        return (error);
                /* WHAT DO WE DO ABOUT PENDING REAL-TIME TIMEOUTS??? */
                boottime.tv_sec += atv.tv_sec - time.tv_sec;
                        return (error);
                /* WHAT DO WE DO ABOUT PENDING REAL-TIME TIMEOUTS??? */
                boottime.tv_sec += atv.tv_sec - time.tv_sec;

-               s = splhigh(); time = atv; splx(s);
+               s = splclock();
+               time.tv_sec = atv.tv_sec;       /* XXX avoid skew in tv_usec */
+               splx(s);

                resettodr();
        }
        if (uap->tzp && (error = copyin((caddr_t)uap->tzp, (caddr_t)&atz,
                resettodr();
        }
        if (uap->tzp && (error = copyin((caddr_t)uap->tzp, (caddr_t)&atz,