Module Name: src
Committed By: dyoung
Date: Fri Jul 1 18:49:24 UTC 2011
Modified Files:
src/sys/arch/sparc64/sparc64: autoconf.c clock.c core_machdep.c
rbus_machdep.c vm_machdep.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.182 src/sys/arch/sparc64/sparc64/autoconf.c
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/sparc64/sparc64/clock.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc64/sparc64/core_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc64/sparc64/rbus_machdep.c
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/sparc64/sparc64/vm_machdep.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/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.181 src/sys/arch/sparc64/sparc64/autoconf.c:1.182
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.181 Fri Jun 3 02:33:27 2011
+++ src/sys/arch/sparc64/sparc64/autoconf.c Fri Jul 1 18:49:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.181 2011/06/03 02:33:27 christos Exp $ */
+/* $NetBSD: autoconf.c,v 1.182 2011/07/01 18:49:24 dyoung Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.181 2011/06/03 02:33:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.182 2011/07/01 18:49:24 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -83,7 +83,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
#include <machine/sparc64.h>
Index: src/sys/arch/sparc64/sparc64/clock.c
diff -u src/sys/arch/sparc64/sparc64/clock.c:1.104 src/sys/arch/sparc64/sparc64/clock.c:1.105
--- src/sys/arch/sparc64/sparc64/clock.c:1.104 Fri Jun 3 02:33:27 2011
+++ src/sys/arch/sparc64/sparc64/clock.c Fri Jul 1 18:49:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.104 2011/06/03 02:33:27 christos Exp $ */
+/* $NetBSD: clock.c,v 1.105 2011/07/01 18:49:24 dyoung Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.104 2011/06/03 02:33:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.105 2011/07/01 18:49:24 dyoung Exp $");
#include "opt_multiprocessor.h"
@@ -81,7 +81,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/eeprom.h>
#include <machine/cpu.h>
Index: src/sys/arch/sparc64/sparc64/core_machdep.c
diff -u src/sys/arch/sparc64/sparc64/core_machdep.c:1.4 src/sys/arch/sparc64/sparc64/core_machdep.c:1.5
--- src/sys/arch/sparc64/sparc64/core_machdep.c:1.4 Fri Jan 14 02:06:32 2011
+++ src/sys/arch/sparc64/sparc64/core_machdep.c Fri Jul 1 18:49:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: core_machdep.c,v 1.4 2011/01/14 02:06:32 rmind Exp $ */
+/* $NetBSD: core_machdep.c,v 1.5 2011/07/01 18:49:24 dyoung Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.4 2011/01/14 02:06:32 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.5 2011/07/01 18:49:24 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,7 +68,7 @@
#include <machine/frame.h>
#include <machine/pcb.h>
#include <machine/trap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* cpu_coredump is called to write a core dump header.
Index: src/sys/arch/sparc64/sparc64/rbus_machdep.c
diff -u src/sys/arch/sparc64/sparc64/rbus_machdep.c:1.15 src/sys/arch/sparc64/sparc64/rbus_machdep.c:1.16
--- src/sys/arch/sparc64/sparc64/rbus_machdep.c:1.15 Sat Mar 14 21:04:16 2009
+++ src/sys/arch/sparc64/sparc64/rbus_machdep.c Fri Jul 1 18:49:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus_machdep.c,v 1.15 2009/03/14 21:04:16 dsl Exp $ */
+/* $NetBSD: rbus_machdep.c,v 1.16 2011/07/01 18:49:24 dyoung Exp $ */
/*
* Copyright (c) 2003 Takeshi Nakayama.
@@ -26,14 +26,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.15 2009/03/14 21:04:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.16 2011/07/01 18:49:24 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/extent.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/openfirm.h>
#include <machine/promlib.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/sparc64/sparc64/vm_machdep.c
diff -u src/sys/arch/sparc64/sparc64/vm_machdep.c:1.96 src/sys/arch/sparc64/sparc64/vm_machdep.c:1.97
--- src/sys/arch/sparc64/sparc64/vm_machdep.c:1.96 Thu Feb 24 04:28:48 2011
+++ src/sys/arch/sparc64/sparc64/vm_machdep.c Fri Jul 1 18:49:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.96 2011/02/24 04:28:48 joerg Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.97 2011/07/01 18:49:24 dyoung Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.96 2011/02/24 04:28:48 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.97 2011/07/01 18:49:24 dyoung Exp $");
#include "opt_multiprocessor.h"
@@ -69,7 +69,7 @@
#include <machine/frame.h>
#include <machine/pcb.h>
#include <machine/trap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* Map a user I/O request into kernel virtual address space.
