[src/trunk]: src/sys/kern Back out previous.

[eeh <eeh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/eba5446db14f
branches:  trunk
changeset: 526389:eba5446db14f
user:      eeh <eeh%NetBSD.org@localhost>
date:      Fri May 03 01:22:30 2002 +0000

description:
Back out previous.

diffstat:

 sys/kern/kern_ntptime.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (49 lines):

diff -r c363c95c4a33 -r eba5446db14f sys/kern/kern_ntptime.c
--- a/sys/kern/kern_ntptime.c   Fri May 03 01:13:54 2002 +0000
+++ b/sys/kern/kern_ntptime.c   Fri May 03 01:22:30 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_ntptime.c,v 1.20 2002/05/03 00:22:16 eeh Exp $    */
+/*     $NetBSD: kern_ntptime.c,v 1.21 2002/05/03 01:22:30 eeh Exp $    */
 
 /******************************************************************************
  *                                                                            *
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ntptime.c,v 1.20 2002/05/03 00:22:16 eeh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ntptime.c,v 1.21 2002/05/03 01:22:30 eeh Exp $");
 
 #include "opt_ntp.h"
 
@@ -207,11 +207,7 @@
        if (ntv.modes != 0 && (error = suser(p->p_ucred, &p->p_acflag)) != 0)
                return (error);
 
-       if ((error = ntp_adjtime1(&ntv, v, retval)) != 0)
-               error = copyout((caddr_t)&ntv, (caddr_t)SCARG(uap, tp),
-                       sizeof(ntv));
-
-       return (error);
+       return (ntp_adjtime1(&ntv, v, retval));
 }
 
 int
@@ -220,6 +216,9 @@
        void *v;
        register_t      *retval;
 {
+       struct sys_ntp_adjtime_args /* {
+               syscallarg(struct timex *) tp;
+       } */ *uap = v;
        int error = 0;
        int modes;
        int s;
@@ -280,6 +279,7 @@
 #endif /* PPS_SYNC */
        (void)splx(s);
 
+       error = copyout((caddr_t)ntv, (caddr_t)SCARG(uap, tp), sizeof(*ntv));
        if (!error) {
 
                /*