Module Name: src
Committed By: dyoung
Date: Fri Jul 1 18:51:52 UTC 2011
Modified Files:
src/sys/arch/sparc/sparc: clock.c cpuunit.c eeprom.c genassym.cf
iommu.c memecc.c mkclock.c msiiep.c oclock.c pci_machdep.c timer.c
timer_sun4.c timer_sun4m.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/sparc/sparc/clock.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc/sparc/cpuunit.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc/sparc/eeprom.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/sparc/sparc/genassym.cf
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/sparc/sparc/iommu.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/sparc/memecc.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sparc/sparc/mkclock.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/sparc/sparc/msiiep.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sparc/sparc/oclock.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc/sparc/pci_machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sparc/sparc/timer.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sparc/sparc/timer_sun4.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sparc/sparc/timer_sun4m.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/sparc/sparc/clock.c
diff -u src/sys/arch/sparc/sparc/clock.c:1.102 src/sys/arch/sparc/sparc/clock.c:1.103
--- src/sys/arch/sparc/sparc/clock.c:1.102 Wed Oct 17 19:57:14 2007
+++ src/sys/arch/sparc/sparc/clock.c Fri Jul 1 18:51:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.102 2007/10/17 19:57:14 garbled Exp $ */
+/* $NetBSD: clock.c,v 1.103 2011/07/01 18:51:51 dyoung Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.102 2007/10/17 19:57:14 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.103 2011/07/01 18:51:51 dyoung Exp $");
#include "opt_sparc_arch.h"
@@ -100,7 +100,7 @@
#include <sys/systm.h>
#include <sys/timetc.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/sparc/sparc/cpuunit.c
diff -u src/sys/arch/sparc/sparc/cpuunit.c:1.13 src/sys/arch/sparc/sparc/cpuunit.c:1.14
--- src/sys/arch/sparc/sparc/cpuunit.c:1.13 Mon Apr 28 20:23:36 2008
+++ src/sys/arch/sparc/sparc/cpuunit.c Fri Jul 1 18:51:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuunit.c,v 1.13 2008/04/28 20:23:36 martin Exp $ */
+/* $NetBSD: cpuunit.c,v 1.14 2011/07/01 18:51:51 dyoung Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpuunit.c,v 1.13 2008/04/28 20:23:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpuunit.c,v 1.14 2011/07/01 18:51:51 dyoung Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -42,7 +42,7 @@
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc/sparc/cpuunitvar.h>
Index: src/sys/arch/sparc/sparc/eeprom.c
diff -u src/sys/arch/sparc/sparc/eeprom.c:1.7 src/sys/arch/sparc/sparc/eeprom.c:1.8
--- src/sys/arch/sparc/sparc/eeprom.c:1.7 Mon Apr 28 20:23:36 2008
+++ src/sys/arch/sparc/sparc/eeprom.c Fri Jul 1 18:51:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: eeprom.c,v 1.7 2008/04/28 20:23:36 martin Exp $ */
+/* $NetBSD: eeprom.c,v 1.8 2011/07/01 18:51:51 dyoung Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eeprom.c,v 1.7 2008/04/28 20:23:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eeprom.c,v 1.8 2011/07/01 18:51:51 dyoung Exp $");
#include "opt_sparc_arch.h"
@@ -49,7 +49,7 @@
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/eeprom.h>
Index: src/sys/arch/sparc/sparc/genassym.cf
diff -u src/sys/arch/sparc/sparc/genassym.cf:1.65 src/sys/arch/sparc/sparc/genassym.cf:1.66
--- src/sys/arch/sparc/sparc/genassym.cf:1.65 Sun Feb 20 10:02:01 2011
+++ src/sys/arch/sparc/sparc/genassym.cf Fri Jul 1 18:51:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.65 2011/02/20 10:02:01 mrg Exp $
+# $NetBSD: genassym.cf,v 1.66 2011/07/01 18:51:51 dyoung Exp $
#
# Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
include <sparc/dev/zsvar.h>
endif
-include <machine/bus.h>
+include <sys/bus.h>
include <sparc/dev/audioamdvar.h>
include <sparc/dev/fdreg.h>
Index: src/sys/arch/sparc/sparc/iommu.c
diff -u src/sys/arch/sparc/sparc/iommu.c:1.92 src/sys/arch/sparc/sparc/iommu.c:1.93
--- src/sys/arch/sparc/sparc/iommu.c:1.92 Sat Nov 7 07:27:46 2009
+++ src/sys/arch/sparc/sparc/iommu.c Fri Jul 1 18:51:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iommu.c,v 1.92 2009/11/07 07:27:46 cegger Exp $ */
+/* $NetBSD: iommu.c,v 1.93 2011/07/01 18:51:51 dyoung Exp $ */
/*
* Copyright (c) 1996
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.92 2009/11/07 07:27:46 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.93 2011/07/01 18:51:51 dyoung Exp $");
#include "opt_sparc_arch.h"
@@ -52,7 +52,7 @@
#include <uvm/uvm.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/ctlreg.h>
#include <sparc/sparc/asm.h>
Index: src/sys/arch/sparc/sparc/memecc.c
diff -u src/sys/arch/sparc/sparc/memecc.c:1.11 src/sys/arch/sparc/sparc/memecc.c:1.12
--- src/sys/arch/sparc/sparc/memecc.c:1.11 Tue Dec 16 22:35:26 2008
+++ src/sys/arch/sparc/sparc/memecc.c Fri Jul 1 18:51:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: memecc.c,v 1.11 2008/12/16 22:35:26 christos Exp $ */
+/* $NetBSD: memecc.c,v 1.12 2011/07/01 18:51:51 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,13 +34,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: memecc.c,v 1.11 2008/12/16 22:35:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: memecc.c,v 1.12 2011/07/01 18:51:51 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <sparc/sparc/memeccreg.h>
Index: src/sys/arch/sparc/sparc/mkclock.c
diff -u src/sys/arch/sparc/sparc/mkclock.c:1.18 src/sys/arch/sparc/sparc/mkclock.c:1.19
--- src/sys/arch/sparc/sparc/mkclock.c:1.18 Mon Apr 28 20:23:36 2008
+++ src/sys/arch/sparc/sparc/mkclock.c Fri Jul 1 18:51:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mkclock.c,v 1.18 2008/04/28 20:23:36 martin Exp $ */
+/* $NetBSD: mkclock.c,v 1.19 2011/07/01 18:51:51 dyoung Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mkclock.c,v 1.18 2008/04/28 20:23:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mkclock.c,v 1.19 2011/07/01 18:51:51 dyoung Exp $");
#include "opt_sparc_arch.h"
@@ -45,7 +45,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/eeprom.h>
#include <machine/promlib.h>
Index: src/sys/arch/sparc/sparc/msiiep.c
diff -u src/sys/arch/sparc/sparc/msiiep.c:1.40 src/sys/arch/sparc/sparc/msiiep.c:1.41
--- src/sys/arch/sparc/sparc/msiiep.c:1.40 Tue May 17 17:34:53 2011
+++ src/sys/arch/sparc/sparc/msiiep.c Fri Jul 1 18:51:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: msiiep.c,v 1.40 2011/05/17 17:34:53 dyoung Exp $ */
+/* $NetBSD: msiiep.c,v 1.41 2011/07/01 18:51:51 dyoung Exp $ */
/*
* Copyright (c) 2001 Valeriy E. Ushakov
@@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.40 2011/05/17 17:34:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.41 2011/07/01 18:51:51 dyoung Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -38,7 +38,7 @@
#include <uvm/uvm.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/promlib.h>
Index: src/sys/arch/sparc/sparc/oclock.c
diff -u src/sys/arch/sparc/sparc/oclock.c:1.19 src/sys/arch/sparc/sparc/oclock.c:1.20
--- src/sys/arch/sparc/sparc/oclock.c:1.19 Sun Jan 3 23:03:21 2010
+++ src/sys/arch/sparc/sparc/oclock.c Fri Jul 1 18:51:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: oclock.c,v 1.19 2010/01/03 23:03:21 mrg Exp $ */
+/* $NetBSD: oclock.c,v 1.20 2011/07/01 18:51:51 dyoung Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oclock.c,v 1.19 2010/01/03 23:03:21 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oclock.c,v 1.20 2011/07/01 18:51:51 dyoung Exp $");
#include "opt_sparc_arch.h"
@@ -46,7 +46,7 @@
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/promlib.h>
#include <machine/autoconf.h>
Index: src/sys/arch/sparc/sparc/pci_machdep.c
diff -u src/sys/arch/sparc/sparc/pci_machdep.c:1.15 src/sys/arch/sparc/sparc/pci_machdep.c:1.16
--- src/sys/arch/sparc/sparc/pci_machdep.c:1.15 Mon Apr 4 20:37:54 2011
+++ src/sys/arch/sparc/sparc/pci_machdep.c Fri Jul 1 18:51:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.15 2011/04/04 20:37:54 dyoung Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.16 2011/07/01 18:51:51 dyoung Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.15 2011/04/04 20:37:54 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.16 2011/07/01 18:51:51 dyoung Exp $");
#if defined(DEBUG) && !defined(SPARC_PCI_DEBUG)
#define SPARC_PCI_DEBUG
@@ -64,7 +64,7 @@
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/ctlreg.h>
Index: src/sys/arch/sparc/sparc/timer.c
diff -u src/sys/arch/sparc/sparc/timer.c:1.27 src/sys/arch/sparc/sparc/timer.c:1.28
--- src/sys/arch/sparc/sparc/timer.c:1.27 Mon Feb 14 10:20:31 2011
+++ src/sys/arch/sparc/sparc/timer.c Fri Jul 1 18:51:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: timer.c,v 1.27 2011/02/14 10:20:31 mrg Exp $ */
+/* $NetBSD: timer.c,v 1.28 2011/07/01 18:51:51 dyoung Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.27 2011/02/14 10:20:31 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.28 2011/07/01 18:51:51 dyoung Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -69,7 +69,7 @@
#include <sys/timetc.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc/sparc/timerreg.h>
#include <sparc/sparc/timervar.h>
Index: src/sys/arch/sparc/sparc/timer_sun4.c
diff -u src/sys/arch/sparc/sparc/timer_sun4.c:1.17 src/sys/arch/sparc/sparc/timer_sun4.c:1.18
--- src/sys/arch/sparc/sparc/timer_sun4.c:1.17 Mon Jan 4 03:54:42 2010
+++ src/sys/arch/sparc/sparc/timer_sun4.c Fri Jul 1 18:51:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: timer_sun4.c,v 1.17 2010/01/04 03:54:42 mrg Exp $ */
+/* $NetBSD: timer_sun4.c,v 1.18 2011/07/01 18:51:51 dyoung Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer_sun4.c,v 1.17 2010/01/04 03:54:42 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer_sun4.c,v 1.18 2011/07/01 18:51:51 dyoung Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -66,7 +66,7 @@
#include <sys/systm.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc/sparc/vaddrs.h>
#include <sparc/sparc/timerreg.h>
Index: src/sys/arch/sparc/sparc/timer_sun4m.c
diff -u src/sys/arch/sparc/sparc/timer_sun4m.c:1.25 src/sys/arch/sparc/sparc/timer_sun4m.c:1.26
--- src/sys/arch/sparc/sparc/timer_sun4m.c:1.25 Tue Feb 15 09:56:32 2011
+++ src/sys/arch/sparc/sparc/timer_sun4m.c Fri Jul 1 18:51:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: timer_sun4m.c,v 1.25 2011/02/15 09:56:32 mrg Exp $ */
+/* $NetBSD: timer_sun4m.c,v 1.26 2011/07/01 18:51:52 dyoung Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer_sun4m.c,v 1.25 2011/02/15 09:56:32 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer_sun4m.c,v 1.26 2011/07/01 18:51:52 dyoung Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -67,7 +67,7 @@
#include <sys/cpu.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc/sparc/vaddrs.h>
#include <sparc/sparc/cpuvar.h>
