Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/kern revert previous
details: https://anonhg.NetBSD.org/src/rev/f21a4e934435
branches: trunk
changeset: 960398:f21a4e934435
user: nia <nia%NetBSD.org@localhost>
date: Thu Mar 18 13:45:15 2021 +0000
description:
revert previous
diffstat:
sys/kern/subr_time.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diffs (35 lines):
diff -r 333bd6309157 -r f21a4e934435 sys/kern/subr_time.c
--- a/sys/kern/subr_time.c Thu Mar 18 12:37:51 2021 +0000
+++ b/sys/kern/subr_time.c Thu Mar 18 13:45:15 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_time.c,v 1.27 2021/03/18 12:37:51 nia Exp $ */
+/* $NetBSD: subr_time.c,v 1.28 2021/03/18 13:45:15 nia Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.27 2021/03/18 12:37:51 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.28 2021/03/18 13:45:15 nia Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -327,11 +327,15 @@
int *timo, struct timespec *start)
{
int error;
+ struct timespec tsd;
if (ts->tv_nsec < 0 || ts->tv_nsec >= 1000000000L)
return EINVAL;
- if (flags != TIMER_RELTIME || start != NULL) {
+ if (start == NULL)
+ start = &tsd;
+
+ if (flags != TIMER_RELTIME || start != &tsd) {
error = clock_gettime1(clock_id, start);
if (error != 0)
return error;
Home |
Main Index |
Thread Index |
Old Index