Module Name: src
Committed By: nakayama
Date: Sun Sep 6 23:48:39 UTC 2015
Modified Files:
src/sys/arch/sparc64/dev: vpci.c
src/sys/arch/sparc64/include: cpu.h pmap.h
src/sys/arch/sparc64/sparc64: cpu.c pmap.c
Log Message:
Use <machine/*.h> instead of <sparc64/*.h> for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/dev/vpci.c
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/sparc64/include/cpu.h
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/sparc64/include/pmap.h
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/sparc64/sparc64/cpu.c
cvs rdiff -u -r1.297 -r1.298 src/sys/arch/sparc64/sparc64/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/dev/vpci.c
diff -u src/sys/arch/sparc64/dev/vpci.c:1.2 src/sys/arch/sparc64/dev/vpci.c:1.3
--- src/sys/arch/sparc64/dev/vpci.c:1.2 Thu Sep 3 19:43:35 2015
+++ src/sys/arch/sparc64/dev/vpci.c Sun Sep 6 23:48:39 2015
@@ -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
#include <sparc64/dev/iommuvar.h>
#include <sparc64/dev/vpcivar.h>
-#include <sparc64/hypervisor.h>
+#include <machine/hypervisor.h>
#ifdef DEBUG
#define VDB_PROM 0x01
Index: src/sys/arch/sparc64/include/cpu.h
diff -u src/sys/arch/sparc64/include/cpu.h:1.116 src/sys/arch/sparc64/include/cpu.h:1.117
--- src/sys/arch/sparc64/include/cpu.h:1.116 Sun Sep 6 16:45:09 2015
+++ src/sys/arch/sparc64/include/cpu.h Sun Sep 6 23:48:39 2015
@@ -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>
Index: src/sys/arch/sparc64/include/pmap.h
diff -u src/sys/arch/sparc64/include/pmap.h:1.59 src/sys/arch/sparc64/include/pmap.h:1.60
--- src/sys/arch/sparc64/include/pmap.h:1.59 Thu Sep 4 18:48:29 2014
+++ src/sys/arch/sparc64/include/pmap.h Sun Sep 6 23:48:39 2015
@@ -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
Index: src/sys/arch/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.126 src/sys/arch/sparc64/sparc64/cpu.c:1.127
--- src/sys/arch/sparc64/sparc64/cpu.c:1.126 Sun Sep 6 16:45:09 2015
+++ src/sys/arch/sparc64/sparc64/cpu.c Sun Sep 6 23:48:39 2015
@@ -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.12
#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
Index: src/sys/arch/sparc64/sparc64/pmap.c
diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.297 src/sys/arch/sparc64/sparc64/pmap.c:1.298
--- src/sys/arch/sparc64/sparc64/pmap.c:1.297 Sun Sep 6 16:45:09 2015
+++ src/sys/arch/sparc64/sparc64/pmap.c Sun Sep 6 23:48:39 2015
@@ -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,13 +58,13 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.2
#include <machine/promlib.h>
#include <machine/kcore.h>
#include <machine/bootinfo.h>
-
-#include <sparc64/sparc64/cache.h>
#ifdef SUN4V
-#include <sparc64/hypervisor.h>
-#include <sparc64/mdesc.h>
+#include <machine/hypervisor.h>
+#include <machine/mdesc.h>
#endif
+#include <sparc64/sparc64/cache.h>
+
#ifdef DDB
#include <machine/db_machdep.h>
#include <ddb/db_command.h>
