diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2024-04-11 18:58:45 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2024-04-11 18:58:45 +0000 |
| commit | 44e9405f05de682ebc0fd45fda499a3e5791e448 (patch) | |
| tree | 6a1a9578e58d6d6e1af7f56d375e82db639217a8 /sys | |
| parent | fab01bb982f8d9a6268779b044828deba6133078 (diff) | |
Stop making <machine/pmap.h> include <machine/pte.h>, and fix the very few
files which really need <machine/pte.h> guts.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sparc64/include/pmap.h | 1 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/db_interface.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/genassym.cf | 5 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/ipifuncs.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/pmap.c | 3 |
5 files changed, 9 insertions, 8 deletions
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> |