From f28d1820ab22a971f7e3925363c43855d0ed1d08 Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Thu, 11 Apr 2024 18:58:44 +0000
Subject: [PATCH] Stop making <machine/pmap.h> include <machine/pte.h>, and fix
 the very few files which really need <machine/pte.h> guts.

---
 lib/libkvm/kvm_sparc64.c                | 4 ++--
 sys/arch/sparc64/include/pmap.h         | 1 -
 sys/arch/sparc64/sparc64/db_interface.c | 4 ++--
 sys/arch/sparc64/sparc64/genassym.cf    | 5 +++--
 sys/arch/sparc64/sparc64/ipifuncs.c     | 4 ++--
 sys/arch/sparc64/sparc64/pmap.c         | 3 ++-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/libkvm/kvm_sparc64.c b/lib/libkvm/kvm_sparc64.c
index 388420e2481..29f7bb83dde 100644
--- a/lib/libkvm/kvm_sparc64.c
+++ b/lib/libkvm/kvm_sparc64.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_sparc64.c,v 1.13 2021/12/01 21:45:19 deraadt Exp $	*/
+/*	$OpenBSD: kvm_sparc64.c,v 1.14 2024/04/11 18:58:44 miod Exp $	*/
 /*	$NetBSD: kvm_sparc64.c,v 1.7 2001/08/05 03:33:15 matt Exp $	*/
 
 /*-
@@ -53,7 +53,7 @@
 
 #include <machine/param.h>
 #include <machine/vmparam.h>
-#include <machine/pmap.h>
+#include <machine/pte.h>
 #include <machine/kcore.h>
 
 #include <limits.h>
diff --git a/sys/arch/sparc64/include/pmap.h b/sys/arch/sparc64/include/pmap.h
index 2c37802bcdc..12d6f2bf0c0 100644
--- a/sys/arch/sparc64/include/pmap.h
+++ b/sys/arch/sparc64/include/pmap.h
@@ -35,7 +35,6 @@
 #define	_MACHINE_PMAP_H_
 
 #ifndef _LOCORE
-#include <machine/pte.h>
 #ifdef	_KERNEL
 #include <sys/queue.h>
 #endif
diff --git a/sys/arch/sparc64/sparc64/db_interface.c b/sys/arch/sparc64/sparc64/db_interface.c
index 0351dfc15e9..dc9003991ab 100644
--- a/sys/arch/sparc64/sparc64/db_interface.c
+++ b/sys/arch/sparc64/sparc64/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.63 2024/03/29 21:27:53 miod Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.64 2024/04/11 18:58:44 miod Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.61 2001/07/31 06:55:47 eeh Exp $ */
 
 /*
@@ -53,7 +53,7 @@
 #include <machine/cpu.h>
 #include <machine/openfirm.h>
 #include <machine/ctlreg.h>
-#include <machine/pmap.h>
+#include <machine/pte.h>
 
 #ifdef notyet
 #include "fb.h"
diff --git a/sys/arch/sparc64/sparc64/genassym.cf b/sys/arch/sparc64/sparc64/genassym.cf
index 3ca1274764e..6740bef818a 100644
--- a/sys/arch/sparc64/sparc64/genassym.cf
+++ b/sys/arch/sparc64/sparc64/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.45 2024/04/08 20:07:53 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.46 2024/04/11 18:58:44 miod Exp $
 #	$NetBSD: genassym.cf,v 1.23 2001/08/08 00:09:30 eeh Exp $
 
 #
@@ -77,8 +77,9 @@ include <sys/user.h>
 
 include <uvm/uvm_extern.h>
 
-include <machine/pmap.h>
 include <machine/cpu.h>
+include <machine/pmap.h>
+include <machine/pte.h>
 
 include <machine/fsr.h>
 include <machine/reg.h>
diff --git a/sys/arch/sparc64/sparc64/ipifuncs.c b/sys/arch/sparc64/sparc64/ipifuncs.c
index 8ce3a66d299..2edd45a756b 100644
--- a/sys/arch/sparc64/sparc64/ipifuncs.c
+++ b/sys/arch/sparc64/sparc64/ipifuncs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipifuncs.c,v 1.20 2024/04/08 20:00:27 miod Exp $	*/
+/*	$OpenBSD: ipifuncs.c,v 1.21 2024/04/11 18:58:44 miod Exp $	*/
 /*	$NetBSD: ipifuncs.c,v 1.8 2006/10/07 18:11:36 rjs Exp $ */
 
 /*-
@@ -36,7 +36,7 @@
 #include <machine/cpu.h>
 #include <machine/ctlreg.h>
 #include <machine/hypervisor.h>
-#include <machine/pmap.h>
+#include <machine/pte.h>
 #include <machine/sparc64.h>
 
 #define SPARC64_IPI_RETRIES	10000
diff --git a/sys/arch/sparc64/sparc64/pmap.c b/sys/arch/sparc64/sparc64/pmap.c
index 246289702f4..b2dbea68520 100644
--- a/sys/arch/sparc64/sparc64/pmap.c
+++ b/sys/arch/sparc64/sparc64/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.118 2024/04/08 20:00:27 miod Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.119 2024/04/11 18:58:44 miod Exp $	*/
 /*	$NetBSD: pmap.c,v 1.107 2001/08/31 16:47:41 eeh Exp $	*/
 /*
  * 
@@ -45,6 +45,7 @@
 #include <machine/hypervisor.h>
 #include <machine/openfirm.h>
 #include <machine/kcore.h>
+#include <machine/pte.h>
 
 #include <sparc64/sparc64/cache.h>
 
-- 
2.20.1