Module Name: src
Committed By: uebayasi
Date: Mon Jan 17 07:13:33 UTC 2011
Modified Files:
src/sys/kern: exec_macho.c exec_subr.c init_main.c kern_idle.c
kern_malloc_debug.c kern_proc.c kern_sig.c subr_pool.c sys_pipe.c
uipc_mbuf.c uipc_socket.c vfs_bio.c vfs_subr.c
Log Message:
Include internal definitions (uvm/uvm.h) only where necessary.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/kern/exec_macho.c
cvs rdiff -u -r1.66 -r1.67 src/sys/kern/exec_subr.c
cvs rdiff -u -r1.424 -r1.425 src/sys/kern/init_main.c
cvs rdiff -u -r1.23 -r1.24 src/sys/kern/kern_idle.c \
src/sys/kern/kern_malloc_debug.c
cvs rdiff -u -r1.168 -r1.169 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.306 -r1.307 src/sys/kern/kern_sig.c
cvs rdiff -u -r1.186 -r1.187 src/sys/kern/subr_pool.c
cvs rdiff -u -r1.128 -r1.129 src/sys/kern/sys_pipe.c
cvs rdiff -u -r1.138 -r1.139 src/sys/kern/uipc_mbuf.c
cvs rdiff -u -r1.201 -r1.202 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.226 -r1.227 src/sys/kern/vfs_bio.c
cvs rdiff -u -r1.417 -r1.418 src/sys/kern/vfs_subr.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/kern/exec_macho.c
diff -u src/sys/kern/exec_macho.c:1.44 src/sys/kern/exec_macho.c:1.45
--- src/sys/kern/exec_macho.c:1.44 Fri Nov 19 06:44:42 2010
+++ src/sys/kern/exec_macho.c Mon Jan 17 07:13:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_macho.c,v 1.44 2010/11/19 06:44:42 dholland Exp $ */
+/* $NetBSD: exec_macho.c,v 1.45 2011/01/17 07:13:31 uebayasi Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exec_macho.c,v 1.44 2010/11/19 06:44:42 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_macho.c,v 1.45 2011/01/17 07:13:31 uebayasi Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -45,7 +45,7 @@
#include <sys/mount.h>
#include <sys/stat.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#ifdef DEBUG_MACHO
#define DPRINTF(a) printf a
Index: src/sys/kern/exec_subr.c
diff -u src/sys/kern/exec_subr.c:1.66 src/sys/kern/exec_subr.c:1.67
--- src/sys/kern/exec_subr.c:1.66 Fri Dec 17 22:35:07 2010
+++ src/sys/kern/exec_subr.c Mon Jan 17 07:13:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_subr.c,v 1.66 2010/12/17 22:35:07 yamt Exp $ */
+/* $NetBSD: exec_subr.c,v 1.67 2011/01/17 07:13:31 uebayasi Exp $ */
/*
* Copyright (c) 1993, 1994, 1996 Christopher G. Demetriou
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.66 2010/12/17 22:35:07 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.67 2011/01/17 07:13:31 uebayasi Exp $");
#include "opt_pax.h"
@@ -50,7 +50,7 @@
#include <sys/pax.h>
#endif /* PAX_MPROTECT */
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#define VMCMD_EVCNT_DECL(name) \
static struct evcnt vmcmd_ev_##name = \
Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.424 src/sys/kern/init_main.c:1.425
--- src/sys/kern/init_main.c:1.424 Thu Dec 16 00:42:22 2010
+++ src/sys/kern/init_main.c Mon Jan 17 07:13:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.424 2010/12/16 00:42:22 eeh Exp $ */
+/* $NetBSD: init_main.c,v 1.425 2011/01/17 07:13:31 uebayasi Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.424 2010/12/16 00:42:22 eeh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.425 2011/01/17 07:13:31 uebayasi Exp $");
#include "opt_ddb.h"
#include "opt_ipsec.h"
@@ -217,7 +217,7 @@
#include <sys/cpu.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm.h> /* extern struct uvm uvm */
#if NSYSMON_TASKQ > 0
#include <dev/sysmon/sysmon_taskq.h>
Index: src/sys/kern/kern_idle.c
diff -u src/sys/kern/kern_idle.c:1.23 src/sys/kern/kern_idle.c:1.24
--- src/sys/kern/kern_idle.c:1.23 Sun Jul 19 10:11:55 2009
+++ src/sys/kern/kern_idle.c Mon Jan 17 07:13:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_idle.c,v 1.23 2009/07/19 10:11:55 yamt Exp $ */
+/* $NetBSD: kern_idle.c,v 1.24 2011/01/17 07:13:31 uebayasi Exp $ */
/*-
* Copyright (c)2002, 2006, 2007 YAMAMOTO Takashi,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_idle.c,v 1.23 2009/07/19 10:11:55 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_idle.c,v 1.24 2011/01/17 07:13:31 uebayasi Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -39,7 +39,7 @@
#include <sys/proc.h>
#include <sys/atomic.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm.h> /* uvm_pageidlezero */
#include <uvm/uvm_extern.h>
void
Index: src/sys/kern/kern_malloc_debug.c
diff -u src/sys/kern/kern_malloc_debug.c:1.23 src/sys/kern/kern_malloc_debug.c:1.24
--- src/sys/kern/kern_malloc_debug.c:1.23 Fri May 14 05:02:06 2010
+++ src/sys/kern/kern_malloc_debug.c Mon Jan 17 07:13:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_malloc_debug.c,v 1.23 2010/05/14 05:02:06 cegger Exp $ */
+/* $NetBSD: kern_malloc_debug.c,v 1.24 2011/01/17 07:13:31 uebayasi Exp $ */
/*
* Copyright (c) 1999, 2000 Artur Grabowski <[email protected]>
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_malloc_debug.c,v 1.23 2010/05/14 05:02:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_malloc_debug.c,v 1.24 2011/01/17 07:13:31 uebayasi Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -65,7 +65,7 @@
#include <sys/systm.h>
#include <sys/pool.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
/*
* debug_malloc_type and debug_malloc_size define the type and size of
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.168 src/sys/kern/kern_proc.c:1.169
--- src/sys/kern/kern_proc.c:1.168 Wed Jul 7 01:30:37 2010
+++ src/sys/kern/kern_proc.c Mon Jan 17 07:13:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.168 2010/07/07 01:30:37 chs Exp $ */
+/* $NetBSD: kern_proc.c,v 1.169 2011/01/17 07:13:31 uebayasi Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.168 2010/07/07 01:30:37 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.169 2011/01/17 07:13:31 uebayasi Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -98,7 +98,7 @@
#include <sys/kmem.h>
#include <sys/dtrace_bsd.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#include <uvm/uvm_extern.h>
/*
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.306 src/sys/kern/kern_sig.c:1.307
--- src/sys/kern/kern_sig.c:1.306 Thu Jul 1 02:38:30 2010
+++ src/sys/kern/kern_sig.c Mon Jan 17 07:13:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.306 2010/07/01 02:38:30 rmind Exp $ */
+/* $NetBSD: kern_sig.c,v 1.307 2011/01/17 07:13:31 uebayasi Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.306 2010/07/01 02:38:30 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.307 2011/01/17 07:13:31 uebayasi Exp $");
#include "opt_ptrace.h"
#include "opt_compat_sunos.h"
@@ -102,7 +102,7 @@
#include <sys/pax.h>
#endif /* PAX_SEGVGUARD */
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#include <uvm/uvm_extern.h>
static void ksiginfo_exechook(struct proc *, void *);
Index: src/sys/kern/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.186 src/sys/kern/subr_pool.c:1.187
--- src/sys/kern/subr_pool.c:1.186 Thu Jun 3 10:40:17 2010
+++ src/sys/kern/subr_pool.c Mon Jan 17 07:13:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pool.c,v 1.186 2010/06/03 10:40:17 pooka Exp $ */
+/* $NetBSD: subr_pool.c,v 1.187 2011/01/17 07:13:32 uebayasi Exp $ */
/*-
* Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.186 2010/06/03 10:40:17 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.187 2011/01/17 07:13:32 uebayasi Exp $");
#include "opt_ddb.h"
#include "opt_pool.h"
@@ -54,7 +54,7 @@
#include <sys/cpu.h>
#include <sys/atomic.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
/*
* Pool resource management utility.
Index: src/sys/kern/sys_pipe.c
diff -u src/sys/kern/sys_pipe.c:1.128 src/sys/kern/sys_pipe.c:1.129
--- src/sys/kern/sys_pipe.c:1.128 Wed Aug 11 11:46:32 2010
+++ src/sys/kern/sys_pipe.c Mon Jan 17 07:13:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_pipe.c,v 1.128 2010/08/11 11:46:32 pgoyette Exp $ */
+/* $NetBSD: sys_pipe.c,v 1.129 2011/01/17 07:13:32 uebayasi Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.128 2010/08/11 11:46:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.129 2011/01/17 07:13:32 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,7 +92,7 @@
#include <sys/atomic.h>
#include <sys/pipe.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
/*
* Use this to disable direct I/O and decrease the code size:
Index: src/sys/kern/uipc_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.138 src/sys/kern/uipc_mbuf.c:1.139
--- src/sys/kern/uipc_mbuf.c:1.138 Wed Nov 24 14:49:18 2010
+++ src/sys/kern/uipc_mbuf.c Mon Jan 17 07:13:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbuf.c,v 1.138 2010/11/24 14:49:18 cegger Exp $ */
+/* $NetBSD: uipc_mbuf.c,v 1.139 2011/01/17 07:13:32 uebayasi Exp $ */
/*-
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.138 2010/11/24 14:49:18 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.139 2011/01/17 07:13:32 uebayasi Exp $");
#include "opt_mbuftrace.h"
#include "opt_nmbclusters.h"
@@ -87,7 +87,7 @@
#include <net/if.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
pool_cache_t mb_cache; /* mbuf cache */
pool_cache_t mcl_cache; /* mbuf cluster cache */
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.201 src/sys/kern/uipc_socket.c:1.202
--- src/sys/kern/uipc_socket.c:1.201 Thu Oct 14 03:07:51 2010
+++ src/sys/kern/uipc_socket.c Mon Jan 17 07:13:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.201 2010/10/14 03:07:51 oki Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.202 2011/01/17 07:13:32 uebayasi Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.201 2010/10/14 03:07:51 oki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.202 2011/01/17 07:13:32 uebayasi Exp $");
#include "opt_compat_netbsd.h"
#include "opt_sock_counters.h"
@@ -98,7 +98,9 @@
#include <compat/sys/socket.h>
#endif
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
+#include <uvm/uvm_loan.h>
+#include <uvm/uvm_page.h>
MALLOC_DEFINE(M_SOOPTS, "soopts", "socket options");
MALLOC_DEFINE(M_SONAME, "soname", "socket name");
Index: src/sys/kern/vfs_bio.c
diff -u src/sys/kern/vfs_bio.c:1.226 src/sys/kern/vfs_bio.c:1.227
--- src/sys/kern/vfs_bio.c:1.226 Wed Dec 22 14:05:50 2010
+++ src/sys/kern/vfs_bio.c Mon Jan 17 07:13:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_bio.c,v 1.226 2010/12/22 14:05:50 reinoud Exp $ */
+/* $NetBSD: vfs_bio.c,v 1.227 2011/01/17 07:13:32 uebayasi Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -123,7 +123,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.226 2010/12/22 14:05:50 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.227 2011/01/17 07:13:32 uebayasi Exp $");
#include "opt_bufcache.h"
@@ -143,7 +143,7 @@
#include <sys/cpu.h>
#include <sys/wapbl.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm.h> /* extern struct uvm uvm */
#include <miscfs/specfs/specdev.h>
Index: src/sys/kern/vfs_subr.c
diff -u src/sys/kern/vfs_subr.c:1.417 src/sys/kern/vfs_subr.c:1.418
--- src/sys/kern/vfs_subr.c:1.417 Fri Dec 17 22:04:42 2010
+++ src/sys/kern/vfs_subr.c Mon Jan 17 07:13:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_subr.c,v 1.417 2010/12/17 22:04:42 yamt Exp $ */
+/* $NetBSD: vfs_subr.c,v 1.418 2011/01/17 07:13:33 uebayasi Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.417 2010/12/17 22:04:42 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.418 2011/01/17 07:13:33 uebayasi Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -125,7 +125,7 @@
#include <miscfs/specfs/specdev.h>
#include <miscfs/syncfs/syncfs.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm.h> /* extern struct uvm uvm */
#include <uvm/uvm_readahead.h>
#include <uvm/uvm_ddb.h>
