Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out previous.

This commit is contained in:
eeh 2002-05-03 01:22:30 +00:00
parent c92f3647a4
commit 80ef33c4c1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/kern/kern_ntptime.c
View File

@ -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 @@ sys_ntp_adjtime(p, v, retval)
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 @@ ntp_adjtime1(ntv, v, retval)
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 @@ ntp_adjtime1(ntv, v, retval)
#endif /* PPS_SYNC */
(void)splx(s);
error = copyout((caddr_t)ntv, (caddr_t)SCARG(uap, tp), sizeof(*ntv));
if (!error) {
/*