Module Name: src Committed By: dyoung Date: Fri Jul 1 18:37:09 UTC 2011
Modified Files: src/sys/arch/xen/x86: consinit.c mainbus.c xen_bus_dma.c Log Message: #include <sys/bus.h> instead of <machine/bus.h>. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/xen/x86/consinit.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/xen/x86/mainbus.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/xen/x86/xen_bus_dma.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/xen/x86/consinit.c diff -u src/sys/arch/xen/x86/consinit.c:1.14 src/sys/arch/xen/x86/consinit.c:1.15 --- src/sys/arch/xen/x86/consinit.c:1.14 Wed Apr 28 19:17:04 2010 +++ src/sys/arch/xen/x86/consinit.c Fri Jul 1 18:37:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: consinit.c,v 1.14 2010/04/28 19:17:04 dyoung Exp $ */ +/* $NetBSD: consinit.c,v 1.15 2011/07/01 18:37:08 dyoung Exp $ */ /* NetBSD: consinit.c,v 1.4 2004/03/13 17:31:34 bjh21 Exp */ /* @@ -28,14 +28,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.14 2010/04/28 19:17:04 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.15 2011/07/01 18:37:08 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 "xencons.h" Index: src/sys/arch/xen/x86/mainbus.c diff -u src/sys/arch/xen/x86/mainbus.c:1.13 src/sys/arch/xen/x86/mainbus.c:1.14 --- src/sys/arch/xen/x86/mainbus.c:1.13 Fri Nov 12 02:07:27 2010 +++ src/sys/arch/xen/x86/mainbus.c Fri Jul 1 18:37:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.13 2010/11/12 02:07:27 dholland Exp $ */ +/* $NetBSD: mainbus.c,v 1.14 2011/07/01 18:37:08 dyoung Exp $ */ /* NetBSD: mainbus.c,v 1.53 2003/10/27 14:11:47 junyoung Exp */ /* @@ -32,13 +32,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.13 2010/11/12 02:07:27 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.14 2011/07/01 18:37:08 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <machine/bus.h> +#include <sys/bus.h> #include "hypervisor.h" #include "pci.h" Index: src/sys/arch/xen/x86/xen_bus_dma.c diff -u src/sys/arch/xen/x86/xen_bus_dma.c:1.22 src/sys/arch/xen/x86/xen_bus_dma.c:1.23 --- src/sys/arch/xen/x86/xen_bus_dma.c:1.22 Fri Nov 12 10:51:14 2010 +++ src/sys/arch/xen/x86/xen_bus_dma.c Fri Jul 1 18:37:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: xen_bus_dma.c,v 1.22 2010/11/12 10:51:14 njoly Exp $ */ +/* $NetBSD: xen_bus_dma.c,v 1.23 2011/07/01 18:37:08 dyoung Exp $ */ /* NetBSD bus_dma.c,v 1.21 2005/04/16 07:53:35 yamt Exp */ /*- @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xen_bus_dma.c,v 1.22 2010/11/12 10:51:14 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xen_bus_dma.c,v 1.23 2011/07/01 18:37:08 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -40,7 +40,7 @@ #include <sys/mbuf.h> #include <sys/proc.h> -#include <machine/bus.h> +#include <sys/bus.h> #include <machine/bus_private.h> #include <uvm/uvm.h>