Module Name: src
Committed By: christos
Date: Tue Oct 2 23:54:55 UTC 2012
Modified Files:
src/sys/arch/algor/conf: files.algor
src/sys/arch/alpha/common: bus_dma.c
src/sys/arch/alpha/conf: files.alpha
src/sys/arch/cobalt/cobalt: bus.c
src/sys/arch/cobalt/conf: files.cobalt
src/sys/arch/emips/conf: files.emips
src/sys/arch/emips/emips: bus_dma.c
src/sys/arch/ews4800mips/conf: files.ews4800mips
src/sys/arch/ews4800mips/ews4800mips: bus_dma.c
src/sys/arch/hpcmips/conf: files.hpcmips
src/sys/arch/hpcmips/hpcmips: bus_dma.c
src/sys/arch/mipsco/conf: files.mipsco
src/sys/arch/mipsco/mipsco: bus_dma.c
src/sys/arch/newsmips/conf: files.newsmips
src/sys/arch/newsmips/newsmips: bus.c
src/sys/arch/pmax/conf: files.pmax
src/sys/arch/pmax/pmax: bus_dma.c
src/sys/arch/sgimips/conf: files.sgimips
src/sys/arch/sgimips/sgimips: bus.c
src/sys/arch/x68k/conf: files.x68k
src/sys/arch/x68k/x68k: bus.c
Log Message:
move common/bus_dma/ -> dev/bus_dma/
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/algor/conf/files.algor
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/alpha/common/bus_dma.c
cvs rdiff -u -r1.184 -r1.185 src/sys/arch/alpha/conf/files.alpha
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/cobalt/cobalt/bus.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/cobalt/conf/files.cobalt
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/emips/conf/files.emips
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/emips/emips/bus_dma.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ews4800mips/conf/files.ews4800mips
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/ews4800mips/ews4800mips/bus_dma.c
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/hpcmips/conf/files.hpcmips
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/hpcmips/hpcmips/bus_dma.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mipsco/conf/files.mipsco
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mipsco/mipsco/bus_dma.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/newsmips/conf/files.newsmips
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/newsmips/newsmips/bus.c
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/pmax/conf/files.pmax
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/pmax/pmax/bus_dma.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/sgimips/conf/files.sgimips
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/sgimips/sgimips/bus.c
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/x68k/conf/files.x68k
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/x68k/x68k/bus.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/algor/conf/files.algor
diff -u src/sys/arch/algor/conf/files.algor:1.29 src/sys/arch/algor/conf/files.algor:1.30
--- src/sys/arch/algor/conf/files.algor:1.29 Sat Jul 9 12:03:01 2011
+++ src/sys/arch/algor/conf/files.algor Tue Oct 2 19:54:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.algor,v 1.29 2011/07/09 16:03:01 matt Exp $
+# $NetBSD: files.algor,v 1.30 2012/10/02 23:54:51 christos Exp $
# Algorithmics evaluation board specific configuration info.
@@ -50,7 +50,7 @@ file arch/mips/mips/bus_dma.c
file arch/mips/mips/mips3_clock.c
file arch/mips/mips/mips3_clockintr.c
-file common/bus_dma/bus_dmamem_common.c
+file dev/bus_dma/bus_dmamem_common.c
#
# The autoconfiguration root.
Index: src/sys/arch/alpha/common/bus_dma.c
diff -u src/sys/arch/alpha/common/bus_dma.c:1.68 src/sys/arch/alpha/common/bus_dma.c:1.69
--- src/sys/arch/alpha/common/bus_dma.c:1.68 Fri Jul 1 15:22:35 2011
+++ src/sys/arch/alpha/common/bus_dma.c Tue Oct 2 19:54:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.68 2011/07/01 19:22:35 dyoung Exp $ */
+/* $NetBSD: bus_dma.c,v 1.69 2012/10/02 23:54:51 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.68 2011/07/01 19:22:35 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.69 2012/10/02 23:54:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v
#include <sys/bus.h>
#include <machine/intr.h>
-#include <common/bus_dma/bus_dmamem_common.h>
+#include <dev/bus_dma/bus_dmamem_common.h>
int _bus_dmamap_load_buffer_direct(bus_dma_tag_t,
bus_dmamap_t, void *, bus_size_t, struct vmspace *, int,
Index: src/sys/arch/alpha/conf/files.alpha
diff -u src/sys/arch/alpha/conf/files.alpha:1.184 src/sys/arch/alpha/conf/files.alpha:1.185
--- src/sys/arch/alpha/conf/files.alpha:1.184 Thu Jun 16 23:55:57 2011
+++ src/sys/arch/alpha/conf/files.alpha Tue Oct 2 19:54:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.alpha,v 1.184 2011/06/17 03:55:57 matt Exp $
+# $NetBSD: files.alpha,v 1.185 2012/10/02 23:54:51 christos Exp $
#
# alpha-specific configuration info
@@ -386,7 +386,7 @@ file arch/alpha/common/comlogout.c
file dev/cons.c
file kern/kern_cctr.c
-file common/bus_dma/bus_dmamem_common.c
+file dev/bus_dma/bus_dmamem_common.c
# PROM console support (for ports that don't have native console support)
file arch/alpha/alpha/promcons.c
Index: src/sys/arch/cobalt/cobalt/bus.c
diff -u src/sys/arch/cobalt/cobalt/bus.c:1.43 src/sys/arch/cobalt/cobalt/bus.c:1.44
--- src/sys/arch/cobalt/cobalt/bus.c:1.43 Sun Feb 12 11:34:07 2012
+++ src/sys/arch/cobalt/cobalt/bus.c Tue Oct 2 19:54:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.43 2012/02/12 16:34:07 matt Exp $ */
+/* $NetBSD: bus.c,v 1.44 2012/10/02 23:54:51 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.43 2012/02/12 16:34:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.44 2012/10/02 23:54:51 christos Exp $");
#define _COBALT_BUS_DMA_PRIVATE
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.43
#include <sys/proc.h>
#include <sys/mbuf.h>
-#include <common/bus_dma/bus_dmamem_common.h>
+#include <dev/bus_dma/bus_dmamem_common.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/cobalt/conf/files.cobalt
diff -u src/sys/arch/cobalt/conf/files.cobalt:1.35 src/sys/arch/cobalt/conf/files.cobalt:1.36
--- src/sys/arch/cobalt/conf/files.cobalt:1.35 Sun Feb 20 02:54:10 2011
+++ src/sys/arch/cobalt/conf/files.cobalt Tue Oct 2 19:54:52 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.cobalt,v 1.35 2011/02/20 07:54:10 matt Exp $
+# $NetBSD: files.cobalt,v 1.36 2012/10/02 23:54:52 christos Exp $
maxpartitions 16
@@ -46,7 +46,7 @@ file arch/cobalt/cobalt/disksubr.c
file arch/cobalt/cobalt/interrupt.c
file arch/cobalt/cobalt/machdep.c
-file common/bus_dma/bus_dmamem_common.c
+file dev/bus_dma/bus_dmamem_common.c
file dev/md_root.c memory_disk_hooks
Index: src/sys/arch/emips/conf/files.emips
diff -u src/sys/arch/emips/conf/files.emips:1.2 src/sys/arch/emips/conf/files.emips:1.3
--- src/sys/arch/emips/conf/files.emips:1.2 Tue Feb 22 03:20:20 2011
+++ src/sys/arch/emips/conf/files.emips Tue Oct 2 19:54:53 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.emips,v 1.2 2011/02/22 08:20:20 matt Exp $
+# $NetBSD: files.emips,v 1.3 2012/10/02 23:54:53 christos Exp $
# eMIPS-specific configuration info
# maxpartitions must be first item in files.${ARCH}.
@@ -96,7 +96,7 @@ file arch/emips/emips/promcall.c
file arch/emips/emips/sysconf.c
file dev/cons.c
-file common/bus_dma/bus_dmamem_common.c
+file dev/bus_dma/bus_dmamem_common.c
#
# Workstation console devices
Index: src/sys/arch/emips/emips/bus_dma.c
diff -u src/sys/arch/emips/emips/bus_dma.c:1.2 src/sys/arch/emips/emips/bus_dma.c:1.3
--- src/sys/arch/emips/emips/bus_dma.c:1.2 Tue Feb 22 03:20:20 2011
+++ src/sys/arch/emips/emips/bus_dma.c Tue Oct 2 19:54:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.2 2011/02/22 08:20:20 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.3 2012/10/02 23:54:53 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.2 2011/02/22 08:20:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.3 2012/10/02 23:54:53 christos Exp $");
#include "opt_cputype.h"
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v
#define _EMIPS_BUS_DMA_PRIVATE
#include <machine/bus.h>
-#include <common/bus_dma/bus_dmamem_common.h>
+#include <dev/bus_dma/bus_dmamem_common.h>
#include <mips/cache.h>
Index: src/sys/arch/ews4800mips/conf/files.ews4800mips
diff -u src/sys/arch/ews4800mips/conf/files.ews4800mips:1.5 src/sys/arch/ews4800mips/conf/files.ews4800mips:1.6
--- src/sys/arch/ews4800mips/conf/files.ews4800mips:1.5 Sun Feb 20 02:55:20 2011
+++ src/sys/arch/ews4800mips/conf/files.ews4800mips Tue Oct 2 19:54:52 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.ews4800mips,v 1.5 2011/02/20 07:55:20 matt Exp $
+# $NetBSD: files.ews4800mips,v 1.6 2012/10/02 23:54:52 christos Exp $
maxpartitions 16
@@ -20,7 +20,7 @@ file arch/ews4800mips/ews4800mips/pdinfo
file arch/ews4800mips/ews4800mips/sector.c disk
file arch/ews4800mips/ews4800mips/vtoc.c disk
-file common/bus_dma/bus_dmamem_common.c
+file dev/bus_dma/bus_dmamem_common.c
file arch/ews4800mips/ews4800mips/cons_machdep.c
file dev/cons.c
Index: src/sys/arch/ews4800mips/ews4800mips/bus_dma.c
diff -u src/sys/arch/ews4800mips/ews4800mips/bus_dma.c:1.12 src/sys/arch/ews4800mips/ews4800mips/bus_dma.c:1.13
--- src/sys/arch/ews4800mips/ews4800mips/bus_dma.c:1.12 Sun Mar 6 09:52:37 2011
+++ src/sys/arch/ews4800mips/ews4800mips/bus_dma.c Tue Oct 2 19:54:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.12 2011/03/06 14:52:37 tsutsui Exp $ */
+/* $NetBSD: bus_dma.c,v 1.13 2012/10/02 23:54:52 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.12 2011/03/06 14:52:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.13 2012/10/02 23:54:52 christos Exp $");
/* #define BUS_DMA_DEBUG */
#include <sys/param.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v
#include <machine/bus.h>
#include <machine/sbdvar.h>
-#include <common/bus_dma/bus_dmamem_common.h>
+#include <dev/bus_dma/bus_dmamem_common.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/hpcmips/conf/files.hpcmips
diff -u src/sys/arch/hpcmips/conf/files.hpcmips:1.106 src/sys/arch/hpcmips/conf/files.hpcmips:1.107
--- src/sys/arch/hpcmips/conf/files.hpcmips:1.106 Wed Aug 24 16:27:36 2011
+++ src/sys/arch/hpcmips/conf/files.hpcmips Tue Oct 2 19:54:52 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpcmips,v 1.106 2011/08/24 20:27:36 dyoung Exp $
+# $NetBSD: files.hpcmips,v 1.107 2012/10/02 23:54:52 christos Exp $
# maxpartitions must be first item in files.${ARCH}.
maxpartitions 8
@@ -60,7 +60,7 @@ file arch/hpcmips/hpcmips/interrupt.c
file arch/hpcmips/hpcmips/machdep.c
file arch/hpcmips/hpcmips/mainbus.c
-file common/bus_dma/bus_dmamem_common.c
+file dev/bus_dma/bus_dmamem_common.c
file dev/kloader.c kloader
file arch/hpcmips/hpcmips/kloader_machdep.c kloader
Index: src/sys/arch/hpcmips/hpcmips/bus_dma.c
diff -u src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.37 src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.38
--- src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.37 Sat Feb 26 07:07:45 2011
+++ src/sys/arch/hpcmips/hpcmips/bus_dma.c Tue Oct 2 19:54:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.37 2011/02/26 12:07:45 tsutsui Exp $ */
+/* $NetBSD: bus_dma.c,v 1.38 2012/10/02 23:54:52 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.37 2011/02/26 12:07:45 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.38 2012/10/02 23:54:52 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v
#include <machine/bus.h>
#include <machine/bus_dma_hpcmips.h>
-#include <common/bus_dma/bus_dmamem_common.h>
+#include <dev/bus_dma/bus_dmamem_common.h>
static int _hpcmips_bd_map_load_buffer(bus_dmamap_t, void *, bus_size_t,
struct vmspace *, int, vaddr_t *, int *, int);
Index: src/sys/arch/mipsco/conf/files.mipsco
diff -u src/sys/arch/mipsco/conf/files.mipsco:1.14 src/sys/arch/mipsco/conf/files.mipsco:1.15
--- src/sys/arch/mipsco/conf/files.mipsco:1.14 Fri Aug 21 00:00:56 2009
+++ src/sys/arch/mipsco/conf/files.mipsco Tue Oct 2 19:54:53 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.mipsco,v 1.14 2009/08/21 04:00:56 thorpej Exp $
+# $NetBSD: files.mipsco,v 1.15 2012/10/02 23:54:53 christos Exp $
# MIPS Computer Corp -specific configuration info
@@ -61,7 +61,7 @@ file arch/mipsco/mipsco/bus_dma.c
file arch/mipsco/mipsco/prom.c
file dev/cons.c
-file common/bus_dma/bus_dmamem_common.c
+file dev/bus_dma/bus_dmamem_common.c
# Memory Disk
file dev/md_root.c memory_disk_hooks
Index: src/sys/arch/mipsco/mipsco/bus_dma.c
diff -u src/sys/arch/mipsco/mipsco/bus_dma.c:1.27 src/sys/arch/mipsco/mipsco/bus_dma.c:1.28
--- src/sys/arch/mipsco/mipsco/bus_dma.c:1.27 Sun Feb 12 11:34:09 2012
+++ src/sys/arch/mipsco/mipsco/bus_dma.c Tue Oct 2 19:54:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.27 2012/02/12 16:34:09 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.28 2012/10/02 23:54:53 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.27 2012/02/12 16:34:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.28 2012/10/02 23:54:53 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v
#define _MIPSCO_BUS_DMA_PRIVATE
#include <machine/bus.h>
-#include <common/bus_dma/bus_dmamem_common.h>
+#include <dev/bus_dma/bus_dmamem_common.h>
#include <mips/cache.h>
Index: src/sys/arch/newsmips/conf/files.newsmips
diff -u src/sys/arch/newsmips/conf/files.newsmips:1.28 src/sys/arch/newsmips/conf/files.newsmips:1.29
--- src/sys/arch/newsmips/conf/files.newsmips:1.28 Sun Feb 20 02:56:31 2011
+++ src/sys/arch/newsmips/conf/files.newsmips Tue Oct 2 19:54:53 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.newsmips,v 1.28 2011/02/20 07:56:31 matt Exp $
+# $NetBSD: files.newsmips,v 1.29 2012/10/02 23:54:53 christos Exp $
# NEWSMIPS-specific configuration info
@@ -96,7 +96,7 @@ file arch/newsmips/newsmips/mainbus.c
file arch/newsmips/newsmips/cpu_cons.c
file dev/cons.c
-file common/bus_dma/bus_dmamem_common.c
+file dev/bus_dma/bus_dmamem_common.c
#
# Machine-independent SCSI driver.
Index: src/sys/arch/newsmips/newsmips/bus.c
diff -u src/sys/arch/newsmips/newsmips/bus.c:1.31 src/sys/arch/newsmips/newsmips/bus.c:1.32
--- src/sys/arch/newsmips/newsmips/bus.c:1.31 Sun Feb 20 02:56:31 2011
+++ src/sys/arch/newsmips/newsmips/bus.c Tue Oct 2 19:54:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.31 2011/02/20 07:56:31 matt Exp $ */
+/* $NetBSD: bus.c,v 1.32 2012/10/02 23:54:53 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.31 2011/02/20 07:56:31 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.32 2012/10/02 23:54:53 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.31
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <common/bus_dma/bus_dmamem_common.h>
+#include <dev/bus_dma/bus_dmamem_common.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/pmax/conf/files.pmax
diff -u src/sys/arch/pmax/conf/files.pmax:1.113 src/sys/arch/pmax/conf/files.pmax:1.114
--- src/sys/arch/pmax/conf/files.pmax:1.113 Sun Feb 20 02:50:24 2011
+++ src/sys/arch/pmax/conf/files.pmax Tue Oct 2 19:54:54 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.pmax,v 1.113 2011/02/20 07:50:24 matt Exp $
+# $NetBSD: files.pmax,v 1.114 2012/10/02 23:54:54 christos Exp $
# DECstation-specific configuration info
# maxpartitions must be first item in files.${ARCH}.
@@ -122,7 +122,7 @@ file arch/pmax/pmax/sysconf.c
file arch/pmax/stand/common/callvec.c
file dev/cons.c
-file common/bus_dma/bus_dmamem_common.c
+file dev/bus_dma/bus_dmamem_common.c
#
# Workstation console devices
Index: src/sys/arch/pmax/pmax/bus_dma.c
diff -u src/sys/arch/pmax/pmax/bus_dma.c:1.56 src/sys/arch/pmax/pmax/bus_dma.c:1.57
--- src/sys/arch/pmax/pmax/bus_dma.c:1.56 Sat Jul 9 13:32:30 2011
+++ src/sys/arch/pmax/pmax/bus_dma.c Tue Oct 2 19:54:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.56 2011/07/09 17:32:30 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.57 2012/10/02 23:54:54 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.56 2011/07/09 17:32:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.57 2012/10/02 23:54:54 christos Exp $");
#include "opt_cputype.h"
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v
#include <uvm/uvm_extern.h>
-#include <common/bus_dma/bus_dmamem_common.h>
+#include <dev/bus_dma/bus_dmamem_common.h>
#include <mips/cache.h>
Index: src/sys/arch/sgimips/conf/files.sgimips
diff -u src/sys/arch/sgimips/conf/files.sgimips:1.50 src/sys/arch/sgimips/conf/files.sgimips:1.51
--- src/sys/arch/sgimips/conf/files.sgimips:1.50 Sun Feb 20 02:59:49 2011
+++ src/sys/arch/sgimips/conf/files.sgimips Tue Oct 2 19:54:54 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.sgimips,v 1.50 2011/02/20 07:59:49 matt Exp $
+# $NetBSD: files.sgimips,v 1.51 2012/10/02 23:54:54 christos Exp $
maxpartitions 16
@@ -26,7 +26,7 @@ file arch/sgimips/sgimips/console.c
file arch/sgimips/sgimips/disksubr.c
file arch/sgimips/sgimips/machdep.c
-file common/bus_dma/bus_dmamem_common.c
+file dev/bus_dma/bus_dmamem_common.c
file arch/mips/mips/mips3_clock.c mips3
file arch/mips/mips/mips3_clockintr.c mips3
Index: src/sys/arch/sgimips/sgimips/bus.c
diff -u src/sys/arch/sgimips/sgimips/bus.c:1.64 src/sys/arch/sgimips/sgimips/bus.c:1.65
--- src/sys/arch/sgimips/sgimips/bus.c:1.64 Sun Feb 12 11:34:10 2012
+++ src/sys/arch/sgimips/sgimips/bus.c Tue Oct 2 19:54:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.64 2012/02/12 16:34:10 matt Exp $ */
+/* $NetBSD: bus.c,v 1.65 2012/10/02 23:54:54 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.64 2012/02/12 16:34:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.65 2012/10/02 23:54:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.64
#include <machine/cpu.h>
#include <machine/machtype.h>
-#include <common/bus_dma/bus_dmamem_common.h>
+#include <dev/bus_dma/bus_dmamem_common.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/x68k/conf/files.x68k
diff -u src/sys/arch/x68k/conf/files.x68k:1.78 src/sys/arch/x68k/conf/files.x68k:1.79
--- src/sys/arch/x68k/conf/files.x68k:1.78 Sun Apr 29 03:17:11 2012
+++ src/sys/arch/x68k/conf/files.x68k Tue Oct 2 19:54:54 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.x68k,v 1.78 2012/04/29 07:17:11 tsutsui Exp $
+# $NetBSD: files.x68k,v 1.79 2012/10/02 23:54:54 christos Exp $
#
# new style config file for x68k architecture
#
@@ -39,7 +39,7 @@ file arch/m68k/m68k/procfs_machdep.c pro
file arch/m68k/m68k/sys_machdep.c
file arch/m68k/m68k/vm_machdep.c
-file common/bus_dma/bus_dmamem_common.c
+file dev/bus_dma/bus_dmamem_common.c
file dev/cons.c
file dev/cninit.c
Index: src/sys/arch/x68k/x68k/bus.c
diff -u src/sys/arch/x68k/x68k/bus.c:1.35 src/sys/arch/x68k/x68k/bus.c:1.36
--- src/sys/arch/x68k/x68k/bus.c:1.35 Sun Jun 6 00:50:08 2010
+++ src/sys/arch/x68k/x68k/bus.c Tue Oct 2 19:54:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.35 2010/06/06 04:50:08 mrg Exp $ */
+/* $NetBSD: bus.c,v 1.36 2012/10/02 23:54:54 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.35 2010/06/06 04:50:08 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.36 2012/10/02 23:54:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.35
#include <m68k/cacheops.h>
#include <machine/bus.h>
-#include <common/bus_dma/bus_dmamem_common.h>
+#include <dev/bus_dma/bus_dmamem_common.h>
#if defined(M68040) || defined(M68060)
static inline void dmasync_flush(bus_addr_t, bus_size_t);
