Module Name: src
Committed By: uebayasi
Date: Wed Apr 28 08:25:33 UTC 2010
Modified Files:
src/sys/arch/i386/i386 [uebayasi-xip]: compat_16_machdep.c dumpsys.c
src/sys/arch/x86/x86 [uebayasi-xip]: bus_dma.c cpu.c
src/sys/uvm [uebayasi-xip]: uvm_meter.c
Log Message:
Adjustment for uvm/uvm_page.h. More to follow later.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.2.1 src/sys/arch/i386/i386/compat_16_machdep.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/arch/i386/i386/dumpsys.c
cvs rdiff -u -r1.52 -r1.52.2.1 src/sys/arch/x86/x86/bus_dma.c
cvs rdiff -u -r1.66 -r1.66.2.1 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.50 -r1.50.2.1 src/sys/uvm/uvm_meter.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/i386/i386/compat_16_machdep.c
diff -u src/sys/arch/i386/i386/compat_16_machdep.c:1.20 src/sys/arch/i386/i386/compat_16_machdep.c:1.20.2.1
--- src/sys/arch/i386/i386/compat_16_machdep.c:1.20 Sat Nov 21 03:11:00 2009
+++ src/sys/arch/i386/i386/compat_16_machdep.c Wed Apr 28 08:25:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_machdep.c,v 1.20 2009/11/21 03:11:00 rmind Exp $ */
+/* $NetBSD: compat_16_machdep.c,v 1.20.2.1 2010/04/28 08:25:33 uebayasi Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.20 2009/11/21 03:11:00 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.20.2.1 2010/04/28 08:25:33 uebayasi Exp $");
#ifdef _KERNEL_OPT
#include "opt_vm86.h"
@@ -52,7 +52,6 @@
#include <machine/vm86.h>
#endif
#include <uvm/uvm_extern.h>
-#include <uvm/uvm_page.h>
#include <machine/pmap.h>
#include <machine/vmparam.h>
Index: src/sys/arch/i386/i386/dumpsys.c
diff -u src/sys/arch/i386/i386/dumpsys.c:1.8 src/sys/arch/i386/i386/dumpsys.c:1.8.2.1
--- src/sys/arch/i386/i386/dumpsys.c:1.8 Sat Nov 7 07:27:44 2009
+++ src/sys/arch/i386/i386/dumpsys.c Wed Apr 28 08:25:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dumpsys.c,v 1.8 2009/11/07 07:27:44 cegger Exp $ */
+/* $NetBSD: dumpsys.c,v 1.8.2.1 2010/04/28 08:25:33 uebayasi Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dumpsys.c,v 1.8 2009/11/07 07:27:44 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dumpsys.c,v 1.8.2.1 2010/04/28 08:25:33 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,7 +83,6 @@
#include <machine/kcore.h>
#include <uvm/uvm_extern.h>
-#include <uvm/uvm_page.h>
/*
* Exports, needed by savecore, the debugger or elsewhere in the kernel.
Index: src/sys/arch/x86/x86/bus_dma.c
diff -u src/sys/arch/x86/x86/bus_dma.c:1.52 src/sys/arch/x86/x86/bus_dma.c:1.52.2.1
--- src/sys/arch/x86/x86/bus_dma.c:1.52 Fri Nov 6 23:10:10 2009
+++ src/sys/arch/x86/x86/bus_dma.c Wed Apr 28 08:25:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.52 2009/11/06 23:10:10 dsl Exp $ */
+/* $NetBSD: bus_dma.c,v 1.52.2.1 2010/04/28 08:25:33 uebayasi 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.52 2009/11/06 23:10:10 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.52.2.1 2010/04/28 08:25:33 uebayasi Exp $");
/*
* The following is included because _bus_dma_uiomove is derived from
@@ -102,6 +102,7 @@
#include <dev/isa/isavar.h>
#include <uvm/uvm_extern.h>
+#include <uvm/uvm_page.h>
extern paddr_t avail_end;
Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.66 src/sys/arch/x86/x86/cpu.c:1.66.2.1
--- src/sys/arch/x86/x86/cpu.c:1.66 Fri Jan 8 19:43:26 2010
+++ src/sys/arch/x86/x86/cpu.c Wed Apr 28 08:25:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.66 2010/01/08 19:43:26 dyoung Exp $ */
+/* $NetBSD: cpu.c,v 1.66.2.1 2010/04/28 08:25:33 uebayasi Exp $ */
/*-
* Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.66 2010/01/08 19:43:26 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.66.2.1 2010/04/28 08:25:33 uebayasi Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -85,6 +85,7 @@
#include <sys/reboot.h>
#include <uvm/uvm_extern.h>
+#include <uvm/uvm_page.h>
#include <machine/cpufunc.h>
#include <machine/cpuvar.h>
Index: src/sys/uvm/uvm_meter.c
diff -u src/sys/uvm/uvm_meter.c:1.50 src/sys/uvm/uvm_meter.c:1.50.2.1
--- src/sys/uvm/uvm_meter.c:1.50 Wed Oct 21 21:12:07 2009
+++ src/sys/uvm/uvm_meter.c Wed Apr 28 08:25:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_meter.c,v 1.50 2009/10/21 21:12:07 rmind Exp $ */
+/* $NetBSD: uvm_meter.c,v 1.50.2.1 2010/04/28 08:25:33 uebayasi Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.50 2009/10/21 21:12:07 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.50.2.1 2010/04/28 08:25:33 uebayasi Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -50,6 +50,7 @@
#include <sys/sysctl.h>
#include <uvm/uvm_extern.h>
+#include <uvm/uvm_page.h>
#include <uvm/uvm_pdpolicy.h>
/*
