Module Name: src
Committed By: martin
Date: Fri Mar 29 10:34:13 UTC 2013
Modified Files:
src/sys/kern: kern_time.c subr_time.c
Log Message:
Move clock_gettime1() to subr_time.c (which is included in rump kernels)
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/kern/kern_time.c
cvs rdiff -u -r1.10 -r1.11 src/sys/kern/subr_time.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_time.c
diff -u src/sys/kern/kern_time.c:1.176 src/sys/kern/kern_time.c:1.177
--- src/sys/kern/kern_time.c:1.176 Fri Mar 29 01:08:17 2013
+++ src/sys/kern/kern_time.c Fri Mar 29 10:34:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time.c,v 1.176 2013/03/29 01:08:17 christos Exp $ */
+/* $NetBSD: kern_time.c,v 1.177 2013/03/29 10:34:12 martin Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.176 2013/03/29 01:08:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.177 2013/03/29 10:34:12 martin Exp $");
#include <sys/param.h>
#include <sys/resourcevar.h>
@@ -190,24 +190,6 @@ sys___clock_gettime50(struct lwp *l,
return copyout(&ats, SCARG(uap, tp), sizeof(ats));
}
-int
-clock_gettime1(clockid_t clock_id, struct timespec *ts)
-{
-
- switch (clock_id) {
- case CLOCK_REALTIME:
- nanotime(ts);
- break;
- case CLOCK_MONOTONIC:
- nanouptime(ts);
- break;
- default:
- return EINVAL;
- }
-
- return 0;
-}
-
/* ARGSUSED */
int
sys___clock_settime50(struct lwp *l,
Index: src/sys/kern/subr_time.c
diff -u src/sys/kern/subr_time.c:1.10 src/sys/kern/subr_time.c:1.11
--- src/sys/kern/subr_time.c:1.10 Fri Mar 29 01:08:17 2013
+++ src/sys/kern/subr_time.c Fri Mar 29 10:34:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_time.c,v 1.10 2013/03/29 01:08:17 christos Exp $ */
+/* $NetBSD: subr_time.c,v 1.11 2013/03/29 10:34:12 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.10 2013/03/29 01:08:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.11 2013/03/29 10:34:12 martin Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -212,6 +212,24 @@ gettimeleft(struct timespec *ts, struct
return tstohz(ts);
}
+int
+clock_gettime1(clockid_t clock_id, struct timespec *ts)
+{
+
+ switch (clock_id) {
+ case CLOCK_REALTIME:
+ nanotime(ts);
+ break;
+ case CLOCK_MONOTONIC:
+ nanouptime(ts);
+ break;
+ default:
+ return EINVAL;
+ }
+
+ return 0;
+}
+
/*
* Calculate delta and convert from struct timespec to the ticks.
*/
