summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpirofti <pirofti@openbsd.org>2020-06-22 12:27:54 +0000
committerpirofti <pirofti@openbsd.org>2020-06-22 12:27:54 +0000
commitb373bb1f2d041705cea84aa6125dc7f4c4ceae99 (patch)
tree086c6ccff3f31870b8fc5581eae53416c7e02788
parentadd missing rcs id (diff)
downloadwireguard-openbsd-b373bb1f2d041705cea84aa6125dc7f4c4ceae99.tar.xz
wireguard-openbsd-b373bb1f2d041705cea84aa6125dc7f4c4ceae99.zip
Change tsc_get_timecount return from uint to u_int per sys/timetc.h.
First brought up by naddy@ in the usertc thread, OK kettenis@.
-rw-r--r--sys/arch/amd64/amd64/tsc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/amd64/amd64/tsc.c b/sys/arch/amd64/amd64/tsc.c
index 7a1dcb4ad75..96f60b33782 100644
--- a/sys/arch/amd64/amd64/tsc.c
+++ b/sys/arch/amd64/amd64/tsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsc.c,v 1.16 2020/04/06 00:01:08 pirofti Exp $ */
+/* $OpenBSD: tsc.c,v 1.17 2020/06/22 12:27:54 pirofti Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* Copyright (c) 2016,2017 Reyk Floeter <reyk@openbsd.org>
@@ -42,7 +42,7 @@ int64_t tsc_drift_observed;
volatile int64_t tsc_sync_val;
volatile struct cpu_info *tsc_sync_cpu;
-uint tsc_get_timecount(struct timecounter *tc);
+u_int tsc_get_timecount(struct timecounter *tc);
#include "lapic.h"
#if NLAPIC > 0
@@ -207,7 +207,7 @@ cpu_recalibrate_tsc(struct timecounter *tc)
calibrate_tsc_freq();
}
-uint
+u_int
tsc_get_timecount(struct timecounter *tc)
{
return rdtsc() + curcpu()->ci_tsc_skew;