Module Name: src
Committed By: rmind
Date: Sun Mar 6 01:38:46 UTC 2011
Modified Files:
src/sys/dev [rmind-uvmplock]: mm.c
src/sys/kern [rmind-uvmplock]: init_main.c
Log Message:
- mm_init: disable pmap_protect() call on zero-page for now (x86 pmap issue).
- Run evcnt_init() a little bit earlier, before uvm_init().
To generate a diff of this commit:
cvs rdiff -u -r1.13.16.4 -r1.13.16.5 src/sys/dev/mm.c
cvs rdiff -u -r1.418.4.4 -r1.418.4.5 src/sys/kern/init_main.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/dev/mm.c
diff -u src/sys/dev/mm.c:1.13.16.4 src/sys/dev/mm.c:1.13.16.5
--- src/sys/dev/mm.c:1.13.16.4 Wed Jun 2 03:12:43 2010
+++ src/sys/dev/mm.c Sun Mar 6 01:38:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mm.c,v 1.13.16.4 2010/06/02 03:12:43 rmind Exp $ */
+/* $NetBSD: mm.c,v 1.13.16.5 2011/03/06 01:38:45 rmind Exp $ */
/*-
* Copyright (c) 2002, 2008, 2010 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mm.c,v 1.13.16.4 2010/06/02 03:12:43 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mm.c,v 1.13.16.5 2011/03/06 01:38:45 rmind Exp $");
#include "opt_compat_netbsd.h"
@@ -89,7 +89,9 @@
/* Read-only zero-page. */
pg = uvm_km_alloc(kernel_map, PAGE_SIZE, 0, UVM_KMF_WIRED|UVM_KMF_ZERO);
KASSERT(pg != 0);
+#if 0
pmap_protect(pmap_kernel(), pg, pg + PAGE_SIZE, VM_PROT_READ);
+#endif
pmap_update(pmap_kernel());
dev_zero_page = (void *)pg;
Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.418.4.4 src/sys/kern/init_main.c:1.418.4.5
--- src/sys/kern/init_main.c:1.418.4.4 Sat Mar 5 20:55:12 2011
+++ src/sys/kern/init_main.c Sun Mar 6 01:38:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.418.4.4 2011/03/05 20:55:12 rmind Exp $ */
+/* $NetBSD: init_main.c,v 1.418.4.5 2011/03/06 01:38:45 rmind 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.418.4.4 2011/03/05 20:55:12 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.418.4.5 2011/03/06 01:38:45 rmind Exp $");
#include "opt_ddb.h"
#include "opt_ipsec.h"
@@ -308,6 +308,9 @@
/* Initialize the device switch tables. */
devsw_init();
+ /* Initialize event counters. */
+ evcnt_init();
+
uvm_init();
prop_kern_init();
@@ -326,9 +329,6 @@
/* Initialize the extent manager. */
extent_init();
- /* Initialize event counters */
- evcnt_init();
-
/* Do machine-dependent initialization. */
cpu_startup();
