From d2bf8c544adc4b080d3ab15d4f08f501b689d964 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 23 Nov 2021 18:47:26 -0700
Subject: [PATCH] riscv: Make machine/regs.h self-contained

Make sys/reg.h self-contained by making riscv's machine/reg.h
self-contained.

Sponsored by:		Netflix
---
 sys/riscv/include/reg.h | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/sys/riscv/include/reg.h b/sys/riscv/include/reg.h
index 003e696e30e..d76b500bce1 100644
--- a/sys/riscv/include/reg.h
+++ b/sys/riscv/include/reg.h
@@ -37,21 +37,23 @@
 #ifndef	_MACHINE_REG_H_
 #define	_MACHINE_REG_H_
 
+#include <sys/_types.h>
+
 struct reg {
-	uint64_t ra;		/* return address */
-	uint64_t sp;		/* stack pointer */
-	uint64_t gp;		/* global pointer */
-	uint64_t tp;		/* thread pointer */
-	uint64_t t[7];		/* temporaries */
-	uint64_t s[12];		/* saved registers */
-	uint64_t a[8];		/* function arguments */
-	uint64_t sepc;		/* exception program counter */
-	uint64_t sstatus;	/* status register */
+	__uint64_t	ra;		/* return address */
+	__uint64_t	sp;		/* stack pointer */
+	__uint64_t	gp;		/* global pointer */
+	__uint64_t	tp;		/* thread pointer */
+	__uint64_t	t[7];		/* temporaries */
+	__uint64_t	s[12];		/* saved registers */
+	__uint64_t	a[8];		/* function arguments */
+	__uint64_t	sepc;		/* exception program counter */
+	__uint64_t	sstatus;	/* status register */
 };
 
 struct fpreg {
-	uint64_t	fp_x[32][2];	/* Floating point registers */
-	uint64_t	fp_fcsr;	/* Floating point control reg */
+	__uint64_t	fp_x[32][2];	/* Floating point registers */
+	__uint64_t	fp_fcsr;	/* Floating point control reg */
 };
 
 struct dbreg {