Module Name: src
Committed By: uebayasi
Date: Fri Nov 12 13:18:59 UTC 2010
Modified Files:
src/sys/arch/amd64/amd64: machdep.c
src/sys/arch/arc/arc: bus_dma.c
src/sys/arch/dreamcast/dev/g2: gapspci_dma.c
src/sys/arch/dreamcast/dev/maple: maple.c
src/sys/arch/evbsh3/evbsh3: bus_dma.c
src/sys/arch/hp700/dev: astro.c uturn.c
src/sys/arch/i386/i386: machdep.c
src/sys/arch/m68k/m68k: bus_dma.c
src/sys/arch/mips/mips: bus_dma.c
src/sys/arch/mvme68k/mvme68k: bus_dma.c
src/sys/arch/vax/vax: bus_dma.c multicpu.c
src/sys/arch/x86/x86: vga_post.c
src/sys/arch/xen/xen: balloon.c
Log Message:
Pull in uvm/uvm.h where UVM's page level interface is used.
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arc/arc/bus_dma.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/dreamcast/dev/g2/gapspci_dma.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/dreamcast/dev/maple/maple.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbsh3/evbsh3/bus_dma.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hp700/dev/astro.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hp700/dev/uturn.c
cvs rdiff -u -r1.697 -r1.698 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/m68k/m68k/bus_dma.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mips/mips/bus_dma.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/mvme68k/mvme68k/bus_dma.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/vax/vax/bus_dma.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/vax/vax/multicpu.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x86/x86/vga_post.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/xen/xen/balloon.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/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.155 src/sys/arch/amd64/amd64/machdep.c:1.156
--- src/sys/arch/amd64/amd64/machdep.c:1.155 Wed Nov 10 09:27:21 2010
+++ src/sys/arch/amd64/amd64/machdep.c Fri Nov 12 13:18:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.155 2010/11/10 09:27:21 uebayasi Exp $ */
+/* $NetBSD: machdep.c,v 1.156 2010/11/12 13:18:56 uebayasi Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008
@@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.155 2010/11/10 09:27:21 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.156 2010/11/12 13:18:56 uebayasi Exp $");
/* #define XENDEBUG_LOW */
@@ -155,7 +155,7 @@
#include <dev/cons.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
#include <uvm/uvm_page.h>
#include <sys/sysctl.h>
Index: src/sys/arch/arc/arc/bus_dma.c
diff -u src/sys/arch/arc/arc/bus_dma.c:1.30 src/sys/arch/arc/arc/bus_dma.c:1.31
--- src/sys/arch/arc/arc/bus_dma.c:1.30 Wed Jun 4 12:41:40 2008
+++ src/sys/arch/arc/arc/bus_dma.c Fri Nov 12 13:18:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.30 2008/06/04 12:41:40 ad Exp $ */
+/* $NetBSD: bus_dma.c,v 1.31 2010/11/12 13:18:56 uebayasi 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.30 2008/06/04 12:41:40 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.31 2010/11/12 13:18:56 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@
#include <sys/device.h>
#include <sys/proc.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
#include <mips/cache.h>
Index: src/sys/arch/dreamcast/dev/g2/gapspci_dma.c
diff -u src/sys/arch/dreamcast/dev/g2/gapspci_dma.c:1.17 src/sys/arch/dreamcast/dev/g2/gapspci_dma.c:1.18
--- src/sys/arch/dreamcast/dev/g2/gapspci_dma.c:1.17 Sat Nov 7 07:27:42 2009
+++ src/sys/arch/dreamcast/dev/g2/gapspci_dma.c Fri Nov 12 13:18:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: gapspci_dma.c,v 1.17 2009/11/07 07:27:42 cegger Exp $ */
+/* $NetBSD: gapspci_dma.c,v 1.18 2010/11/12 13:18:56 uebayasi Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: gapspci_dma.c,v 1.17 2009/11/07 07:27:42 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gapspci_dma.c,v 1.18 2010/11/12 13:18:56 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,7 +55,7 @@
#include <dreamcast/dev/g2/gapspcivar.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
int gaps_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
bus_size_t, int, bus_dmamap_t *);
Index: src/sys/arch/dreamcast/dev/maple/maple.c
diff -u src/sys/arch/dreamcast/dev/maple/maple.c:1.42 src/sys/arch/dreamcast/dev/maple/maple.c:1.43
--- src/sys/arch/dreamcast/dev/maple/maple.c:1.42 Sun Oct 17 14:17:49 2010
+++ src/sys/arch/dreamcast/dev/maple/maple.c Fri Nov 12 13:18:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: maple.c,v 1.42 2010/10/17 14:17:49 tsutsui Exp $ */
+/* $NetBSD: maple.c,v 1.43 2010/11/12 13:18:57 uebayasi Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: maple.c,v 1.42 2010/10/17 14:17:49 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: maple.c,v 1.43 2010/11/12 13:18:57 uebayasi Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -76,7 +76,7 @@
#include <sys/systm.h>
#include <sys/conf.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
#include <machine/cpu.h>
#include <machine/bus.h>
Index: src/sys/arch/evbsh3/evbsh3/bus_dma.c
diff -u src/sys/arch/evbsh3/evbsh3/bus_dma.c:1.1 src/sys/arch/evbsh3/evbsh3/bus_dma.c:1.2
--- src/sys/arch/evbsh3/evbsh3/bus_dma.c:1.1 Tue Apr 6 15:54:30 2010
+++ src/sys/arch/evbsh3/evbsh3/bus_dma.c Fri Nov 12 13:18:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.1 2010/04/06 15:54:30 nonaka Exp $ */
+/* $NetBSD: bus_dma.c,v 1.2 2010/11/12 13:18:57 uebayasi Exp $ */
/*
* Copyright (c) 2005 NONAKA Kimihiro <[email protected]>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.1 2010/04/06 15:54:30 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.2 2010/11/12 13:18:57 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -35,7 +35,7 @@
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
#include <sh3/cache.h>
Index: src/sys/arch/hp700/dev/astro.c
diff -u src/sys/arch/hp700/dev/astro.c:1.9 src/sys/arch/hp700/dev/astro.c:1.10
--- src/sys/arch/hp700/dev/astro.c:1.9 Sun Mar 7 08:56:07 2010
+++ src/sys/arch/hp700/dev/astro.c Fri Nov 12 13:18:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: astro.c,v 1.9 2010/03/07 08:56:07 skrll Exp $ */
+/* $NetBSD: astro.c,v 1.10 2010/11/12 13:18:57 uebayasi Exp $ */
/* $OpenBSD: astro.c,v 1.8 2007/10/06 23:50:54 krw Exp $ */
@@ -26,7 +26,7 @@
#include <sys/reboot.h>
#include <sys/tree.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
#include <machine/iomod.h>
#include <machine/autoconf.h>
Index: src/sys/arch/hp700/dev/uturn.c
diff -u src/sys/arch/hp700/dev/uturn.c:1.11 src/sys/arch/hp700/dev/uturn.c:1.12
--- src/sys/arch/hp700/dev/uturn.c:1.11 Mon Jun 21 11:04:27 2010
+++ src/sys/arch/hp700/dev/uturn.c Fri Nov 12 13:18:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uturn.c,v 1.11 2010/06/21 11:04:27 skrll Exp $ */
+/* $NetBSD: uturn.c,v 1.12 2010/11/12 13:18:57 uebayasi Exp $ */
/* $OpenBSD: uturn.c,v 1.6 2007/12/29 01:26:14 kettenis Exp $ */
@@ -38,7 +38,7 @@
#include <sys/extent.h>
#include <sys/mbuf.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
#include <machine/bus.h>
#include <machine/iomod.h>
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.697 src/sys/arch/i386/i386/machdep.c:1.698
--- src/sys/arch/i386/i386/machdep.c:1.697 Wed Nov 10 09:27:22 2010
+++ src/sys/arch/i386/i386/machdep.c Fri Nov 12 13:18:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.697 2010/11/10 09:27:22 uebayasi Exp $ */
+/* $NetBSD: machdep.c,v 1.698 2010/11/12 13:18:57 uebayasi Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.697 2010/11/10 09:27:22 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.698 2010/11/12 13:18:57 uebayasi Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@@ -125,7 +125,7 @@
#include <dev/cons.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
#include <uvm/uvm_page.h>
#include <sys/sysctl.h>
Index: src/sys/arch/m68k/m68k/bus_dma.c
diff -u src/sys/arch/m68k/m68k/bus_dma.c:1.30 src/sys/arch/m68k/m68k/bus_dma.c:1.31
--- src/sys/arch/m68k/m68k/bus_dma.c:1.30 Sun Jun 6 04:50:07 2010
+++ src/sys/arch/m68k/m68k/bus_dma.c Fri Nov 12 13:18:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.30 2010/06/06 04:50:07 mrg Exp $ */
+/* $NetBSD: bus_dma.c,v 1.31 2010/11/12 13:18:58 uebayasi Exp $ */
/*
* This file was taken from from alpha/common/bus_dma.c
@@ -41,7 +41,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.30 2010/06/06 04:50:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.31 2010/11/12 13:18:58 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@
#include <sys/proc.h>
#include <sys/mbuf.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
#include <machine/cpu.h>
Index: src/sys/arch/mips/mips/bus_dma.c
diff -u src/sys/arch/mips/mips/bus_dma.c:1.23 src/sys/arch/mips/mips/bus_dma.c:1.24
--- src/sys/arch/mips/mips/bus_dma.c:1.23 Mon Dec 14 00:46:05 2009
+++ src/sys/arch/mips/mips/bus_dma.c Fri Nov 12 13:18:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.23 2009/12/14 00:46:05 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.24 2010/11/12 13:18:58 uebayasi Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 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.23 2009/12/14 00:46:05 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.24 2010/11/12 13:18:58 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@
#include <sys/proc.h>
#include <sys/mbuf.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
#include <mips/cache.h>
#ifdef _LP64
Index: src/sys/arch/mvme68k/mvme68k/bus_dma.c
diff -u src/sys/arch/mvme68k/mvme68k/bus_dma.c:1.36 src/sys/arch/mvme68k/mvme68k/bus_dma.c:1.37
--- src/sys/arch/mvme68k/mvme68k/bus_dma.c:1.36 Wed Jun 4 12:41:41 2008
+++ src/sys/arch/mvme68k/mvme68k/bus_dma.c Fri Nov 12 13:18:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.36 2008/06/04 12:41:41 ad Exp $ */
+/* $NetBSD: bus_dma.c,v 1.37 2010/11/12 13:18:58 uebayasi Exp $ */
/*
* This file was taken from from next68k/dev/bus_dma.c, which was originally
@@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.36 2008/06/04 12:41:41 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.37 2010/11/12 13:18:58 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@
#include <sys/mbuf.h>
#include <sys/kcore.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
#include <machine/cpu.h>
#include <machine/pmap.h>
Index: src/sys/arch/vax/vax/bus_dma.c
diff -u src/sys/arch/vax/vax/bus_dma.c:1.33 src/sys/arch/vax/vax/bus_dma.c:1.34
--- src/sys/arch/vax/vax/bus_dma.c:1.33 Wed Mar 18 16:00:16 2009
+++ src/sys/arch/vax/vax/bus_dma.c Fri Nov 12 13:18:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.33 2009/03/18 16:00:16 cegger Exp $ */
+/* $NetBSD: bus_dma.c,v 1.34 2010/11/12 13:18:59 uebayasi Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.33 2009/03/18 16:00:16 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.34 2010/11/12 13:18:59 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@
#include <sys/vnode.h>
#include <sys/device.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
#define _VAX_BUS_DMA_PRIVATE
#include <machine/bus.h>
Index: src/sys/arch/vax/vax/multicpu.c
diff -u src/sys/arch/vax/vax/multicpu.c:1.29 src/sys/arch/vax/vax/multicpu.c:1.30
--- src/sys/arch/vax/vax/multicpu.c:1.29 Tue Jun 22 18:29:02 2010
+++ src/sys/arch/vax/vax/multicpu.c Fri Nov 12 13:18:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: multicpu.c,v 1.29 2010/06/22 18:29:02 rmind Exp $ */
+/* $NetBSD: multicpu.c,v 1.30 2010/11/12 13:18:59 uebayasi Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: multicpu.c,v 1.29 2010/06/22 18:29:02 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: multicpu.c,v 1.30 2010/11/12 13:18:59 uebayasi Exp $");
#include "opt_multiprocessor.h"
@@ -46,7 +46,7 @@
#include <sys/device.h>
#include <sys/xcall.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
#include <machine/cpu.h>
#include <vax/vax/gencons.h>
Index: src/sys/arch/x86/x86/vga_post.c
diff -u src/sys/arch/x86/x86/vga_post.c:1.16 src/sys/arch/x86/x86/vga_post.c:1.17
--- src/sys/arch/x86/x86/vga_post.c:1.16 Sun Oct 3 19:46:35 2010
+++ src/sys/arch/x86/x86/vga_post.c Fri Nov 12 13:18:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_post.c,v 1.16 2010/10/03 19:46:35 rmind Exp $ */
+/* $NetBSD: vga_post.c,v 1.17 2010/11/12 13:18:59 uebayasi Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <[email protected]>.
@@ -30,12 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_post.c,v 1.16 2010/10/03 19:46:35 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_post.c,v 1.17 2010/11/12 13:18:59 uebayasi Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/kmem.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
#include <uvm/uvm_page.h>
#include <machine/pio.h>
Index: src/sys/arch/xen/xen/balloon.c
diff -u src/sys/arch/xen/xen/balloon.c:1.5 src/sys/arch/xen/xen/balloon.c:1.6
--- src/sys/arch/xen/xen/balloon.c:1.5 Wed Aug 11 11:32:58 2010
+++ src/sys/arch/xen/xen/balloon.c Fri Nov 12 13:18:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: balloon.c,v 1.5 2010/08/11 11:32:58 pgoyette Exp $ */
+/* $NetBSD: balloon.c,v 1.6 2010/11/12 13:18:59 uebayasi Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: balloon.c,v 1.5 2010/08/11 11:32:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: balloon.c,v 1.6 2010/11/12 13:18:59 uebayasi Exp $");
#include <sys/inttypes.h>
#include <sys/param.h>
@@ -73,7 +73,7 @@
#include <xen/balloon.h>
#include <uvm/uvm.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
#include <xen/xenpmap.h>
#define BALLOONINTERVALMS 100 /* milliseconds */
