[Midnightbsd-cvs] src [12327] trunk/sys/sys/vdso.h: sync with FreeBSD 11-stable

[laffer1 at midnightbsd.org]

Revision: 12327
          http://svnweb.midnightbsd.org/src/?rev=12327
Author:   laffer1
Date:     2020-02-08 14:54:27 -0500 (Sat, 08 Feb 2020)
Log Message:
-----------
sync with FreeBSD 11-stable

Modified Paths:
--------------
    trunk/sys/sys/vdso.h

Modified: trunk/sys/sys/vdso.h
===================================================================
--- trunk/sys/sys/vdso.h	2020-02-08 19:53:25 UTC (rev 12326)
+++ trunk/sys/sys/vdso.h	2020-02-08 19:54:27 UTC (rev 12327)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright 2012 Konstantin Belousov <kib at FreeBSD.ORG>.
  * All rights reserved.
@@ -22,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: stable/11/sys/sys/vdso.h 331722 2018-03-29 02:50:57Z eadler $
  */
 
 #ifndef _SYS_VDSO_H
@@ -53,6 +54,9 @@
 #define	VDSO_TK_VER_1		0x1
 #define	VDSO_TK_VER_CURR	VDSO_TK_VER_1
 #define	VDSO_TH_ALGO_1		0x1
+#define	VDSO_TH_ALGO_2		0x2
+#define	VDSO_TH_ALGO_3		0x3
+#define	VDSO_TH_ALGO_4		0x4
 
 #ifndef _KERNEL
 
@@ -62,7 +66,7 @@
 
 int __vdso_clock_gettime(clockid_t clock_id, struct timespec *ts);
 int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz);
-u_int __vdso_gettc(const struct vdso_timehands *vdso_th);
+int __vdso_gettc(const struct vdso_timehands *vdso_th, u_int *tc);
 int __vdso_gettimekeep(struct vdso_timekeep **tk);
 
 #endif
@@ -69,6 +73,14 @@
 
 #ifdef _KERNEL
 
+struct timecounter;
+
+struct vdso_sv_tk {
+	int		sv_timekeep_off;
+	int		sv_timekeep_curr;
+	uint32_t	sv_timekeep_gen;
+};
+
 void timekeep_push_vdso(void);
 
 uint32_t tc_fill_vdso_timehands(struct vdso_timehands *vdso_th);
@@ -81,8 +93,11 @@
  * global sysctl enable override is handled by machine-independed code
  * after cpu_fill_vdso_timehands() call is made.
  */
-uint32_t cpu_fill_vdso_timehands(struct vdso_timehands *vdso_th);
+uint32_t cpu_fill_vdso_timehands(struct vdso_timehands *vdso_th,
+    struct timecounter *tc);
 
+struct vdso_sv_tk *alloc_sv_tk(void);
+
 #define	VDSO_TH_NUM	4
 
 #ifdef COMPAT_FREEBSD32
@@ -110,7 +125,9 @@
 };
 
 uint32_t tc_fill_vdso_timehands32(struct vdso_timehands32 *vdso_th32);
-uint32_t cpu_fill_vdso_timehands32(struct vdso_timehands32 *vdso_th32);
+uint32_t cpu_fill_vdso_timehands32(struct vdso_timehands32 *vdso_th32,
+    struct timecounter *tc);
+struct vdso_sv_tk *alloc_sv_tk_compat32(void);
 
 #endif
 #endif