From f4df0c2422c5e0cb8ac5e7781bede14ae9499064 Mon Sep 17 00:00:00 2001
From: nakayama <nakayama@NetBSD.org>
Date: Sun, 6 Sep 2015 23:48:39 +0000
Subject: [PATCH] Use <machine/*.h> instead of <sparc64/*.h> for consistency.

---
 sys/arch/sparc64/dev/vpci.c     |  6 +++---
 sys/arch/sparc64/include/cpu.h  |  4 ++--
 sys/arch/sparc64/include/pmap.h |  4 ++--
 sys/arch/sparc64/sparc64/cpu.c  |  8 ++++----
 sys/arch/sparc64/sparc64/pmap.c | 12 ++++++------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/sys/arch/sparc64/dev/vpci.c b/sys/arch/sparc64/dev/vpci.c
index 29aef287fd98..ecaaa945b97d 100644
--- a/sys/arch/sparc64/dev/vpci.c
+++ b/sys/arch/sparc64/dev/vpci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vpci.c,v 1.2 2015/09/03 19:43:35 palle Exp $	*/
+/*	$NetBSD: vpci.c,v 1.3 2015/09/06 23:48:39 nakayama Exp $	*/
 /*
  * Copyright (c) 2015 Palle Lyckegaard
  * All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vpci.c,v 1.2 2015/09/03 19:43:35 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vpci.c,v 1.3 2015/09/06 23:48:39 nakayama Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: vpci.c,v 1.2 2015/09/03 19:43:35 palle Exp $");
 #include <sparc64/dev/iommuvar.h>
 #include <sparc64/dev/vpcivar.h>
 
-#include <sparc64/hypervisor.h>
+#include <machine/hypervisor.h>
 
 #ifdef DEBUG
 #define VDB_PROM             0x01
diff --git a/sys/arch/sparc64/include/cpu.h b/sys/arch/sparc64/include/cpu.h
index 096f42412ec4..08085e4c45cd 100644
--- a/sys/arch/sparc64/include/cpu.h
+++ b/sys/arch/sparc64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.116 2015/09/06 16:45:09 martin Exp $ */
+/*	$NetBSD: cpu.h,v 1.117 2015/09/06 23:48:39 nakayama Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -72,7 +72,7 @@
 #include <sparc64/sparc64/intreg.h>
 #endif
 #ifdef SUN4V
-#include <sparc64/hypervisor.h>
+#include <machine/hypervisor.h>
 #endif
 
 #include <sys/cpu_data.h>
diff --git a/sys/arch/sparc64/include/pmap.h b/sys/arch/sparc64/include/pmap.h
index 7c6bb49a92ca..373b5447d4a7 100644
--- a/sys/arch/sparc64/include/pmap.h
+++ b/sys/arch/sparc64/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.59 2014/09/04 18:48:29 palle Exp $	*/
+/*	$NetBSD: pmap.h,v 1.60 2015/09/06 23:48:39 nakayama Exp $	*/
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -41,7 +41,7 @@
 #ifdef _KERNEL
 #include <machine/cpuset.h>
 #ifdef SUN4V
-#include <sparc64/hypervisor.h>
+#include <machine/hypervisor.h>
 #endif
 #endif
 #endif
diff --git a/sys/arch/sparc64/sparc64/cpu.c b/sys/arch/sparc64/sparc64/cpu.c
index 75721fc3aaa0..1c7309fac76d 100644
--- a/sys/arch/sparc64/sparc64/cpu.c
+++ b/sys/arch/sparc64/sparc64/cpu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.126 2015/09/06 16:45:09 martin Exp $ */
+/*	$NetBSD: cpu.c,v 1.127 2015/09/06 23:48:39 nakayama Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.126 2015/09/06 16:45:09 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.127 2015/09/06 23:48:39 nakayama Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -72,10 +72,10 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.126 2015/09/06 16:45:09 martin Exp $");
 #include <machine/pmap.h>
 #include <machine/sparc64.h>
 #include <machine/openfirm.h>
+#include <machine/hypervisor.h>
+#include <machine/mdesc.h>
 
 #include <sparc64/sparc64/cache.h>
-#include <sparc64/hypervisor.h>
-#include <sparc64/mdesc.h>
 
 #define SUN4V_MONDO_QUEUE_SIZE	32
 #define SUN4V_QUEUE_ENTRY_SIZE	64
diff --git a/sys/arch/sparc64/sparc64/pmap.c b/sys/arch/sparc64/sparc64/pmap.c
index d59d6cfaf62b..652c4718c881 100644
--- a/sys/arch/sparc64/sparc64/pmap.c
+++ b/sys/arch/sparc64/sparc64/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.297 2015/09/06 16:45:09 martin Exp $	*/
+/*	$NetBSD: pmap.c,v 1.298 2015/09/06 23:48:39 nakayama Exp $	*/
 /*
  *
  * Copyright (C) 1996-1999 Eduardo Horvath.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.297 2015/09/06 16:45:09 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.298 2015/09/06 23:48:39 nakayama Exp $");
 
 #undef	NO_VCACHE /* Don't forget the locked TLB in dostart */
 #define	HWREF
@@ -58,12 +58,12 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.297 2015/09/06 16:45:09 martin Exp $");
 #include <machine/promlib.h>
 #include <machine/kcore.h>
 #include <machine/bootinfo.h>
+#ifdef SUN4V
+#include <machine/hypervisor.h>
+#include <machine/mdesc.h>
+#endif
 
 #include <sparc64/sparc64/cache.h>
-#ifdef SUN4V
-#include <sparc64/hypervisor.h>
-#include <sparc64/mdesc.h>
-#endif
 
 #ifdef DDB
 #include <machine/db_machdep.h>