From 4b64ca3ec48c786968cbb21e835d04b75f1b53c9 Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Fri, 29 Mar 2024 21:08:10 +0000
Subject: [PATCH] No longer include <machine/fsr.h> from <machine/reg.h>, and
 have the few users which need both explicitly include both.

ok claudio@ kettenis@
---
 sys/arch/sparc64/fpu/fpu.c           | 3 ++-
 sys/arch/sparc64/fpu/fpu_add.c       | 3 ++-
 sys/arch/sparc64/fpu/fpu_compare.c   | 3 ++-
 sys/arch/sparc64/fpu/fpu_div.c       | 3 ++-
 sys/arch/sparc64/fpu/fpu_explode.c   | 3 ++-
 sys/arch/sparc64/fpu/fpu_implode.c   | 3 ++-
 sys/arch/sparc64/fpu/fpu_subr.c      | 3 ++-
 sys/arch/sparc64/include/reg.h       | 4 +---
 sys/arch/sparc64/sparc64/genassym.cf | 3 ++-
 sys/arch/sparc64/sparc64/trap.c      | 3 ++-
 10 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/sys/arch/sparc64/fpu/fpu.c b/sys/arch/sparc64/fpu/fpu.c
index a928e1ddbfa..537aae8f3e2 100644
--- a/sys/arch/sparc64/fpu/fpu.c
+++ b/sys/arch/sparc64/fpu/fpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu.c,v 1.24 2024/03/29 21:07:11 miod Exp $	*/
+/*	$OpenBSD: fpu.c,v 1.25 2024/03/29 21:08:10 miod Exp $	*/
 /*	$NetBSD: fpu.c,v 1.11 2000/12/06 01:47:50 mrg Exp $ */
 
 /*
@@ -75,6 +75,7 @@
 #include <sys/signalvar.h>
 
 #include <machine/instr.h>
+#include <machine/fsr.h>
 #include <machine/reg.h>
 
 #include <sparc64/fpu/fpu_emu.h>
diff --git a/sys/arch/sparc64/fpu/fpu_add.c b/sys/arch/sparc64/fpu/fpu_add.c
index 21dae5a3f93..43fce433934 100644
--- a/sys/arch/sparc64/fpu/fpu_add.c
+++ b/sys/arch/sparc64/fpu/fpu_add.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_add.c,v 1.4 2024/03/29 21:07:11 miod Exp $	*/
+/*	$OpenBSD: fpu_add.c,v 1.5 2024/03/29 21:08:10 miod Exp $	*/
 /*	$NetBSD: fpu_add.c,v 1.3 1996/03/14 19:41:52 christos Exp $ */
 
 /*
@@ -52,6 +52,7 @@
 #include <sys/systm.h>
 #endif
 
+#include <machine/fsr.h>
 #include <machine/reg.h>
 #include <machine/instr.h>
 
diff --git a/sys/arch/sparc64/fpu/fpu_compare.c b/sys/arch/sparc64/fpu/fpu_compare.c
index d3f47427a64..b8a32e241cb 100644
--- a/sys/arch/sparc64/fpu/fpu_compare.c
+++ b/sys/arch/sparc64/fpu/fpu_compare.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_compare.c,v 1.4 2024/03/29 21:07:11 miod Exp $	*/
+/*	$OpenBSD: fpu_compare.c,v 1.5 2024/03/29 21:08:10 miod Exp $	*/
 /*	$NetBSD: fpu_compare.c,v 1.3 2001/08/26 05:46:31 eeh Exp $ */
 
 /*
@@ -50,6 +50,7 @@
 
 #include <sys/types.h>
 
+#include <machine/fsr.h>
 #include <machine/reg.h>
 
 #include <sparc64/fpu/fpu_arith.h>
diff --git a/sys/arch/sparc64/fpu/fpu_div.c b/sys/arch/sparc64/fpu/fpu_div.c
index e20b1dd4be7..be8055495bc 100644
--- a/sys/arch/sparc64/fpu/fpu_div.c
+++ b/sys/arch/sparc64/fpu/fpu_div.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_div.c,v 1.5 2024/03/29 21:07:11 miod Exp $	*/
+/*	$OpenBSD: fpu_div.c,v 1.6 2024/03/29 21:08:10 miod Exp $	*/
 /*	$NetBSD: fpu_div.c,v 1.2 1994/11/20 20:52:38 deraadt Exp $ */
 
 /*
@@ -47,6 +47,7 @@
 
 #include <sys/types.h>
 
+#include <machine/fsr.h>
 #include <machine/reg.h>
 
 #include <sparc64/fpu/fpu_arith.h>
diff --git a/sys/arch/sparc64/fpu/fpu_explode.c b/sys/arch/sparc64/fpu/fpu_explode.c
index 4f61fad85ad..a703d843b59 100644
--- a/sys/arch/sparc64/fpu/fpu_explode.c
+++ b/sys/arch/sparc64/fpu/fpu_explode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_explode.c,v 1.7 2024/03/29 21:07:11 miod Exp $	*/
+/*	$OpenBSD: fpu_explode.c,v 1.8 2024/03/29 21:08:10 miod Exp $	*/
 /*	$NetBSD: fpu_explode.c,v 1.5 2000/08/03 18:32:08 eeh Exp $ */
 
 /*
@@ -49,6 +49,7 @@
 #include <sys/types.h>
 #include <sys/systm.h>
 
+#include <machine/fsr.h>
 #include <machine/ieee.h>
 #include <machine/instr.h>
 #include <machine/reg.h>
diff --git a/sys/arch/sparc64/fpu/fpu_implode.c b/sys/arch/sparc64/fpu/fpu_implode.c
index 7ffa449bff8..aba1f5c220e 100644
--- a/sys/arch/sparc64/fpu/fpu_implode.c
+++ b/sys/arch/sparc64/fpu/fpu_implode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_implode.c,v 1.10 2024/03/29 21:07:11 miod Exp $	*/
+/*	$OpenBSD: fpu_implode.c,v 1.11 2024/03/29 21:08:10 miod Exp $	*/
 /*	$NetBSD: fpu_implode.c,v 1.7 2000/08/03 18:32:08 eeh Exp $ */
 
 /*
@@ -49,6 +49,7 @@
 #include <sys/types.h>
 #include <sys/systm.h>
 
+#include <machine/fsr.h>
 #include <machine/ieee.h>
 #include <machine/instr.h>
 #include <machine/reg.h>
diff --git a/sys/arch/sparc64/fpu/fpu_subr.c b/sys/arch/sparc64/fpu/fpu_subr.c
index 2109b360047..69b9f433ffe 100644
--- a/sys/arch/sparc64/fpu/fpu_subr.c
+++ b/sys/arch/sparc64/fpu/fpu_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_subr.c,v 1.3 2024/03/29 21:07:11 miod Exp $	*/
+/*	$OpenBSD: fpu_subr.c,v 1.4 2024/03/29 21:08:10 miod Exp $	*/
 /*	$NetBSD: fpu_subr.c,v 1.3 1996/03/14 19:42:01 christos Exp $ */
 
 /*
@@ -50,6 +50,7 @@
 #include <sys/systm.h>
 #endif
 
+#include <machine/fsr.h>
 #include <machine/reg.h>
 #include <machine/instr.h>
 
diff --git a/sys/arch/sparc64/include/reg.h b/sys/arch/sparc64/include/reg.h
index 8d989f8a5d6..edbddc11baa 100644
--- a/sys/arch/sparc64/include/reg.h
+++ b/sys/arch/sparc64/include/reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg.h,v 1.7 2022/10/22 20:09:41 miod Exp $	*/
+/*	$OpenBSD: reg.h,v 1.8 2024/03/29 21:08:11 miod Exp $	*/
 /*	$NetBSD: reg.h,v 1.8 2001/06/19 12:59:16 wiz Exp $ */
 
 /*
@@ -68,8 +68,6 @@ struct reg {
 	int64_t r_in[8];	/* %i* registers in trap's caller */
 };
 
-#include <machine/fsr.h>
-
 /*
  * FP coprocessor registers.
  *
diff --git a/sys/arch/sparc64/sparc64/genassym.cf b/sys/arch/sparc64/sparc64/genassym.cf
index 48fd26b907f..4a38fd32942 100644
--- a/sys/arch/sparc64/sparc64/genassym.cf
+++ b/sys/arch/sparc64/sparc64/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.40 2023/01/11 19:57:17 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.41 2024/03/29 21:08:11 miod Exp $
 #	$NetBSD: genassym.cf,v 1.23 2001/08/08 00:09:30 eeh Exp $
 
 #
@@ -88,6 +88,7 @@ include <machine/pmap.h>
 include <machine/cpu.h>
 include <machine/mutex.h>
 
+include <machine/fsr.h>
 include <machine/reg.h>
 
 ifdef notyet
diff --git a/sys/arch/sparc64/sparc64/trap.c b/sys/arch/sparc64/sparc64/trap.c
index 35599c48b71..54b868789ba 100644
--- a/sys/arch/sparc64/sparc64/trap.c
+++ b/sys/arch/sparc64/sparc64/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.120 2024/03/29 21:06:14 miod Exp $	*/
+/*	$OpenBSD: trap.c,v 1.121 2024/03/29 21:08:11 miod Exp $	*/
 /*	$NetBSD: trap.c,v 1.73 2001/08/09 01:03:01 eeh Exp $ */
 
 /*
@@ -67,6 +67,7 @@
 
 #include <machine/cpu.h>
 #include <machine/ctlreg.h>
+#include <machine/fsr.h>
 #include <machine/trap.h>
 #include <machine/instr.h>
 #include <machine/pmap.h>
-- 
2.20.1