Module Name: src
Committed By: dyoung
Date: Fri Jul 1 18:21:31 UTC 2011
Modified Files:
src/sys/arch/x86/x86: bus_dma.c consinit.c genfb_machdep.c mp.c
mpacpi.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/x86/x86/bus_dma.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/x86/x86/consinit.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/x86/genfb_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/x86/mp.c
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/x86/x86/mpacpi.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/x86/x86/bus_dma.c
diff -u src/sys/arch/x86/x86/bus_dma.c:1.56 src/sys/arch/x86/x86/bus_dma.c:1.57
--- src/sys/arch/x86/x86/bus_dma.c:1.56 Sat Nov 6 11:46:03 2010
+++ src/sys/arch/x86/x86/bus_dma.c Fri Jul 1 18:21:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.56 2010/11/06 11:46:03 uebayasi Exp $ */
+/* $NetBSD: bus_dma.c,v 1.57 2011/07/01 18:21:31 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.56 2010/11/06 11:46:03 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.57 2011/07/01 18:21:31 dyoung Exp $");
/*
* The following is included because _bus_dma_uiomove is derived from
@@ -93,7 +93,7 @@
#include <sys/mbuf.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/bus_private.h>
#include <machine/i82093var.h>
#include <machine/mpbiosvar.h>
Index: src/sys/arch/x86/x86/consinit.c
diff -u src/sys/arch/x86/x86/consinit.c:1.21 src/sys/arch/x86/x86/consinit.c:1.22
--- src/sys/arch/x86/x86/consinit.c:1.21 Wed Apr 28 19:17:04 2010
+++ src/sys/arch/x86/x86/consinit.c Fri Jul 1 18:21:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.21 2010/04/28 19:17:04 dyoung Exp $ */
+/* $NetBSD: consinit.c,v 1.22 2011/07/01 18:21:31 dyoung Exp $ */
/*
* Copyright (c) 1998
@@ -27,14 +27,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.21 2010/04/28 19:17:04 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.22 2011/07/01 18:21:31 dyoung Exp $");
#include "opt_kgdb.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/bootinfo.h>
#include <arch/x86/include/genfb_machdep.h>
Index: src/sys/arch/x86/x86/genfb_machdep.c
diff -u src/sys/arch/x86/x86/genfb_machdep.c:1.9 src/sys/arch/x86/x86/genfb_machdep.c:1.10
--- src/sys/arch/x86/x86/genfb_machdep.c:1.9 Tue Feb 15 18:10:33 2011
+++ src/sys/arch/x86/x86/genfb_machdep.c Fri Jul 1 18:21:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_machdep.c,v 1.9 2011/02/15 18:10:33 jruoho Exp $ */
+/* $NetBSD: genfb_machdep.c,v 1.10 2011/07/01 18:21:31 dyoung Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill <[email protected]>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb_machdep.c,v 1.9 2011/02/15 18:10:33 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_machdep.c,v 1.10 2011/07/01 18:21:31 dyoung Exp $");
#include "opt_mtrr.h"
@@ -42,7 +42,7 @@
#include <sys/kernel.h>
#include <sys/lwp.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/bootinfo.h>
#include <machine/mtrr.h>
Index: src/sys/arch/x86/x86/mp.c
diff -u src/sys/arch/x86/x86/mp.c:1.2 src/sys/arch/x86/x86/mp.c:1.3
--- src/sys/arch/x86/x86/mp.c:1.2 Sat Jun 13 13:35:11 2009
+++ src/sys/arch/x86/x86/mp.c Fri Jul 1 18:21:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mp.c,v 1.2 2009/06/13 13:35:11 tsutsui Exp $ */
+/* $NetBSD: mp.c,v 1.3 2011/07/01 18:21:31 dyoung Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mp.c,v 1.2 2009/06/13 13:35:11 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mp.c,v 1.3 2011/07/01 18:21:31 dyoung Exp $");
#include "opt_multiprocessor.h"
#include "pchb.h"
@@ -50,7 +50,7 @@
#include <machine/specialreg.h>
#include <machine/cpuvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/mpconfig.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/x86/x86/mpacpi.c
diff -u src/sys/arch/x86/x86/mpacpi.c:1.91 src/sys/arch/x86/x86/mpacpi.c:1.92
--- src/sys/arch/x86/x86/mpacpi.c:1.91 Tue Apr 5 13:17:04 2011
+++ src/sys/arch/x86/x86/mpacpi.c Fri Jul 1 18:21:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mpacpi.c,v 1.91 2011/04/05 13:17:04 pgoyette Exp $ */
+/* $NetBSD: mpacpi.c,v 1.92 2011/07/01 18:21:31 dyoung Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.91 2011/04/05 13:17:04 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.92 2011/07/01 18:21:31 dyoung Exp $");
#include "acpica.h"
#include "opt_acpi.h"
@@ -55,7 +55,7 @@
#include <machine/specialreg.h>
#include <machine/cpuvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/mpacpi.h>
#include <machine/mpbiosvar.h>
