From e894dd1ef2ed9fa40e341feae4e796b3de643d8f Mon Sep 17 00:00:00 2001
From: visa <visa@openbsd.org>
Date: Sun, 30 May 2021 15:08:08 +0000
Subject: [PATCH] Include <sys/mutex.h> and <sys/queue.h> earlier in powerpc*
 pmap.h to avoid hidden header dependencies.

OK jsg@ deraadt@
---
 sys/arch/powerpc/include/pmap.h   | 7 ++++---
 sys/arch/powerpc64/include/pmap.h | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/sys/arch/powerpc/include/pmap.h b/sys/arch/powerpc/include/pmap.h
index 7a0f7601239..290fb7a71a7 100644
--- a/sys/arch/powerpc/include/pmap.h
+++ b/sys/arch/powerpc/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.59 2015/10/08 10:20:14 kettenis Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.60 2021/05/30 15:08:08 visa Exp $	*/
 /*	$NetBSD: pmap.h,v 1.1 1996/09/30 16:34:29 ws Exp $	*/
 
 /*-
@@ -77,6 +77,9 @@ typedef u_int sr_t;
 #define PMAP_CACHE_WT		2 	/* writethru */
 #define PMAP_CACHE_WB		3	/* writeback */
 
+#include <sys/mutex.h>
+#include <sys/queue.h>
+
 #ifdef	_KERNEL
 
 /*
@@ -164,8 +167,6 @@ int reserve_dumppages(caddr_t p);
 
 #endif	/* _KERNEL */
 
-#include <sys/mutex.h>
-
 struct vm_page_md {
 	struct mutex pv_mtx;
 	LIST_HEAD(,pte_desc) pv_list;
diff --git a/sys/arch/powerpc64/include/pmap.h b/sys/arch/powerpc64/include/pmap.h
index a531278411b..bb6c29dd926 100644
--- a/sys/arch/powerpc64/include/pmap.h
+++ b/sys/arch/powerpc64/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.16 2021/05/11 18:21:12 kettenis Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.17 2021/05/30 15:08:08 visa Exp $	*/
 
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
@@ -19,6 +19,9 @@
 #ifndef _MACHINE_PMAP_H_
 #define _MACHINE_PMAP_H_
 
+#include <sys/mutex.h>
+#include <sys/queue.h>
+
 #ifdef _KERNEL
 
 #include <machine/pte.h>
@@ -80,9 +83,6 @@ struct pte *pmap_get_kernel_pte(vaddr_t);
 
 #endif	/* _KERNEL */
 
-#include <sys/mutex.h>
-#include <sys/queue.h>
-
 struct vm_page_md {
 	struct mutex pv_mtx;
 	LIST_HEAD(,pte_desc) pv_list;
-- 
2.20.1