Module Name: src
Committed By: dyoung
Date: Fri Jul 1 19:28:00 UTC 2011
Modified Files:
src/sys/arch/arc/arc: bus_dma.c bus_space_large.c bus_space_sparse.c
c_jazz_eisa.c c_magnum.c c_nec_pci.c machdep.c p_dti_arcstation.c
src/sys/arch/arc/pci: necpb.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arc/arc/bus_dma.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arc/arc/bus_space_large.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arc/arc/bus_space_sparse.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/arc/c_jazz_eisa.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arc/arc/c_magnum.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arc/arc/c_nec_pci.c
cvs rdiff -u -r1.123 -r1.124 src/sys/arch/arc/arc/machdep.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arc/arc/p_dti_arcstation.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/arc/pci/necpb.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/arc/arc/bus_dma.c
diff -u src/sys/arch/arc/arc/bus_dma.c:1.32 src/sys/arch/arc/arc/bus_dma.c:1.33
--- src/sys/arch/arc/arc/bus_dma.c:1.32 Sun Feb 20 07:52:42 2011
+++ src/sys/arch/arc/arc/bus_dma.c Fri Jul 1 19:28:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.32 2011/02/20 07:52:42 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.33 2011/07/01 19:28:00 dyoung Exp $ */
/* NetBSD: bus_dma.c,v 1.20 2000/01/10 03:24:36 simonb Exp */
/*-
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.32 2011/02/20 07:52:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.33 2011/07/01 19:28:00 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@
#include <mips/cache.h>
#define _ARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
paddr_t kvtophys(vaddr_t); /* XXX */
Index: src/sys/arch/arc/arc/bus_space_large.c
diff -u src/sys/arch/arc/arc/bus_space_large.c:1.7 src/sys/arch/arc/arc/bus_space_large.c:1.8
--- src/sys/arch/arc/arc/bus_space_large.c:1.7 Mon Apr 28 20:23:13 2008
+++ src/sys/arch/arc/arc/bus_space_large.c Fri Jul 1 19:28:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space_large.c,v 1.7 2008/04/28 20:23:13 martin Exp $ */
+/* $NetBSD: bus_space_large.c,v 1.8 2011/07/01 19:28:00 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space_large.c,v 1.7 2008/04/28 20:23:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space_large.c,v 1.8 2011/07/01 19:28:00 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,7 +57,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/wired_map.h>
static int arc_large_bus_space_compose_handle(bus_space_tag_t, bus_addr_t,
Index: src/sys/arch/arc/arc/bus_space_sparse.c
diff -u src/sys/arch/arc/arc/bus_space_sparse.c:1.17 src/sys/arch/arc/arc/bus_space_sparse.c:1.18
--- src/sys/arch/arc/arc/bus_space_sparse.c:1.17 Sun Feb 20 07:52:42 2011
+++ src/sys/arch/arc/arc/bus_space_sparse.c Fri Jul 1 19:28:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space_sparse.c,v 1.17 2011/02/20 07:52:42 matt Exp $ */
+/* $NetBSD: bus_space_sparse.c,v 1.18 2011/07/01 19:28:00 dyoung Exp $ */
/* NetBSD: bus_machdep.c,v 1.1 2000/01/26 18:48:00 drochner Exp */
/*-
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space_sparse.c,v 1.17 2011/02/20 07:52:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space_sparse.c,v 1.18 2011/07/01 19:28:00 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@
#include <mips/cpuregs.h>
#include <mips/pte.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
extern paddr_t kvtophys(vaddr_t); /* XXX */
Index: src/sys/arch/arc/arc/c_jazz_eisa.c
diff -u src/sys/arch/arc/arc/c_jazz_eisa.c:1.12 src/sys/arch/arc/arc/c_jazz_eisa.c:1.13
--- src/sys/arch/arc/arc/c_jazz_eisa.c:1.12 Sun Dec 11 12:16:37 2005
+++ src/sys/arch/arc/arc/c_jazz_eisa.c Fri Jul 1 19:28:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: c_jazz_eisa.c,v 1.12 2005/12/11 12:16:37 christos Exp $ */
+/* $NetBSD: c_jazz_eisa.c,v 1.13 2011/07/01 19:28:00 dyoung Exp $ */
/*
* Copyright (c) 1998
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: c_jazz_eisa.c,v 1.12 2005/12/11 12:16:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: c_jazz_eisa.c,v 1.13 2011/07/01 19:28:00 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/platform.h>
Index: src/sys/arch/arc/arc/c_magnum.c
diff -u src/sys/arch/arc/arc/c_magnum.c:1.21 src/sys/arch/arc/arc/c_magnum.c:1.22
--- src/sys/arch/arc/arc/c_magnum.c:1.21 Sun Feb 20 07:52:42 2011
+++ src/sys/arch/arc/arc/c_magnum.c Fri Jul 1 19:28:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: c_magnum.c,v 1.21 2011/02/20 07:52:42 matt Exp $ */
+/* $NetBSD: c_magnum.c,v 1.22 2011/07/01 19:28:00 dyoung Exp $ */
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
/*
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: c_magnum.c,v 1.21 2011/02/20 07:52:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: c_magnum.c,v 1.22 2011/07/01 19:28:00 dyoung Exp $");
#define __INTR_PRIVATE
#include <sys/param.h>
@@ -54,7 +54,7 @@
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/platform.h>
#include <machine/wired_map.h>
Index: src/sys/arch/arc/arc/c_nec_pci.c
diff -u src/sys/arch/arc/arc/c_nec_pci.c:1.18 src/sys/arch/arc/arc/c_nec_pci.c:1.19
--- src/sys/arch/arc/arc/c_nec_pci.c:1.18 Sun Feb 20 07:52:42 2011
+++ src/sys/arch/arc/arc/c_nec_pci.c Fri Jul 1 19:28:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: c_nec_pci.c,v 1.18 2011/02/20 07:52:42 matt Exp $ */
+/* $NetBSD: c_nec_pci.c,v 1.19 2011/07/01 19:28:00 dyoung Exp $ */
/*-
* Copyright (C) 2000 Shuichiro URATA. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: c_nec_pci.c,v 1.18 2011/02/20 07:52:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: c_nec_pci.c,v 1.19 2011/07/01 19:28:00 dyoung Exp $");
#define __INTR_PRIVATE
#include <sys/param.h>
@@ -43,7 +43,7 @@
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/platform.h>
#include <machine/wired_map.h>
Index: src/sys/arch/arc/arc/machdep.c
diff -u src/sys/arch/arc/arc/machdep.c:1.123 src/sys/arch/arc/arc/machdep.c:1.124
--- src/sys/arch/arc/arc/machdep.c:1.123 Sun Feb 20 07:52:42 2011
+++ src/sys/arch/arc/arc/machdep.c Fri Jul 1 19:28:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.123 2011/02/20 07:52:42 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.124 2011/07/01 19:28:00 dyoung Exp $ */
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
/*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.123 2011/02/20 07:52:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.124 2011/07/01 19:28:00 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_ddbparam.h"
@@ -74,7 +74,7 @@
#include <machine/cpu.h>
#include <machine/reg.h>
#include <machine/pio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/trap.h>
#include <machine/autoconf.h>
#include <machine/platform.h>
Index: src/sys/arch/arc/arc/p_dti_arcstation.c
diff -u src/sys/arch/arc/arc/p_dti_arcstation.c:1.16 src/sys/arch/arc/arc/p_dti_arcstation.c:1.17
--- src/sys/arch/arc/arc/p_dti_arcstation.c:1.16 Sun Feb 20 07:52:42 2011
+++ src/sys/arch/arc/arc/p_dti_arcstation.c Fri Jul 1 19:28:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: p_dti_arcstation.c,v 1.16 2011/02/20 07:52:42 matt Exp $ */
+/* $NetBSD: p_dti_arcstation.c,v 1.17 2011/07/01 19:28:00 dyoung Exp $ */
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
/*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: p_dti_arcstation.c,v 1.16 2011/02/20 07:52:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p_dti_arcstation.c,v 1.17 2011/07/01 19:28:00 dyoung Exp $");
#define __INTR_PRIVATE
#include <sys/param.h>
@@ -50,7 +50,7 @@
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/platform.h>
#include <machine/wired_map.h>
Index: src/sys/arch/arc/pci/necpb.c
diff -u src/sys/arch/arc/pci/necpb.c:1.36 src/sys/arch/arc/pci/necpb.c:1.37
--- src/sys/arch/arc/pci/necpb.c:1.36 Tue May 17 17:34:47 2011
+++ src/sys/arch/arc/pci/necpb.c Fri Jul 1 19:28:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: necpb.c,v 1.36 2011/05/17 17:34:47 dyoung Exp $ */
+/* $NetBSD: necpb.c,v 1.37 2011/07/01 19:28:00 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: necpb.c,v 1.36 2011/05/17 17:34:47 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: necpb.c,v 1.37 2011/07/01 19:28:00 dyoung Exp $");
#include "opt_pci.h"
@@ -77,7 +77,7 @@
#include <uvm/uvm_extern.h>
#define _ARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
