Module Name: src
Committed By: uebayasi
Date: Tue Nov 16 03:03:28 UTC 2010
Modified Files:
src/sys/uvm [uebayasi-xip]: uvm_init.c uvm_param.h
Log Message:
Sync with HEAD.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.2.1 src/sys/uvm/uvm_init.c
cvs rdiff -u -r1.22 -r1.22.2.1 src/sys/uvm/uvm_param.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/uvm_init.c
diff -u src/sys/uvm/uvm_init.c:1.36 src/sys/uvm/uvm_init.c:1.36.2.1
--- src/sys/uvm/uvm_init.c:1.36 Wed Oct 21 21:12:07 2009
+++ src/sys/uvm/uvm_init.c Tue Nov 16 03:03:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_init.c,v 1.36 2009/10/21 21:12:07 rmind Exp $ */
+/* $NetBSD: uvm_init.c,v 1.36.2.1 2010/11/16 03:03:28 uebayasi Exp $ */
/*
*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_init.c,v 1.36 2009/10/21 21:12:07 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_init.c,v 1.36.2.1 2010/11/16 03:03:28 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,6 +66,12 @@
struct uvmexp uvmexp; /* decl */
struct uvm_object *uvm_kernel_object;
+#if defined(__uvmexp_pagesize)
+int *uvmexp_pagesize = &uvmexp.pagesize;
+int *uvmexp_pagemask = &uvmexp.pagemask;
+int *uvmexp_pageshift = &uvmexp.pageshift;
+#endif
+
kmutex_t uvm_pageqlock;
kmutex_t uvm_fpageqlock;
kmutex_t uvm_kentry_lock;
Index: src/sys/uvm/uvm_param.h
diff -u src/sys/uvm/uvm_param.h:1.22 src/sys/uvm/uvm_param.h:1.22.2.1
--- src/sys/uvm/uvm_param.h:1.22 Mon Jul 20 03:51:42 2009
+++ src/sys/uvm/uvm_param.h Tue Nov 16 03:03:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_param.h,v 1.22 2009/07/20 03:51:42 kiyohara Exp $ */
+/* $NetBSD: uvm_param.h,v 1.22.2.1 2010/11/16 03:03:28 uebayasi Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -72,7 +72,6 @@
#endif
#ifdef _KERNEL
#include <sys/types.h>
-#include <sys/lock.h>
#include <machine/vmparam.h>
#include <sys/resourcevar.h>
#endif
@@ -146,9 +145,13 @@
* have ones that are compile-time constants.
*/
#if !defined(PAGE_SIZE)
-#define PAGE_SIZE uvmexp.pagesize /* size of page */
-#define PAGE_MASK uvmexp.pagemask /* size of page - 1 */
-#define PAGE_SHIFT uvmexp.pageshift /* bits to shift for pages */
+extern int *uvmexp_pagesize;
+extern int *uvmexp_pagemask;
+extern int *uvmexp_pageshift;
+#define PAGE_SIZE (*uvmexp_pagesize) /* size of page */
+#define PAGE_MASK (*uvmexp_pagemask) /* size of page - 1 */
+#define PAGE_SHIFT (*uvmexp_pageshift) /* bits to shift for pages */
+#define __uvmexp_pagesize
#endif /* PAGE_SIZE */
#endif /* _KERNEL */
