Module Name: src
Committed By: jmcneill
Date: Sat Sep 3 12:33:03 UTC 2011
Modified Files:
src/sys/arch/usermode/usermode: machdep.c pmap.c
Log Message:
move call of urkelvisor_init to main instead of pmap_bootstrap
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/usermode/usermode/machdep.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/usermode/usermode/pmap.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/usermode/usermode/machdep.c
diff -u src/sys/arch/usermode/usermode/machdep.c:1.20 src/sys/arch/usermode/usermode/machdep.c:1.21
--- src/sys/arch/usermode/usermode/machdep.c:1.20 Thu Sep 1 15:15:06 2011
+++ src/sys/arch/usermode/usermode/machdep.c Sat Sep 3 12:33:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.20 2011/09/01 15:15:06 reinoud Exp $ */
+/* $NetBSD: machdep.c,v 1.21 2011/09/03 12:33:02 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,8 +26,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include "opt_memsize.h"
+#include "opt_sdl.h"
+#include "opt_urkelvisor.h"
+
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.20 2011/09/01 15:15:06 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.21 2011/09/03 12:33:02 jmcneill Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -45,8 +49,9 @@
#include <machine/thunk.h>
-#include "opt_memsize.h"
-#include "opt_sdl.h"
+#if defined(URKELVISOR)
+#include <machine/urkelvisor.h>
+#endif
char machine[] = "usermode";
char machine_arch[] = "usermode";
@@ -103,6 +108,10 @@
pmap_bootstrap();
+#if defined(URKELVISOR)
+ urkelvisor_init();
+#endif
+
splraise(IPL_HIGH);
kernmain();
Index: src/sys/arch/usermode/usermode/pmap.c
diff -u src/sys/arch/usermode/usermode/pmap.c:1.51 src/sys/arch/usermode/usermode/pmap.c:1.52
--- src/sys/arch/usermode/usermode/pmap.c:1.51 Sat Sep 3 12:28:46 2011
+++ src/sys/arch/usermode/usermode/pmap.c Sat Sep 3 12:33:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.51 2011/09/03 12:28:46 jmcneill Exp $ */
+/* $NetBSD: pmap.c,v 1.52 2011/09/03 12:33:03 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk <rein...@netbsd.org>
@@ -27,11 +27,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.51 2011/09/03 12:28:46 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.52 2011/09/03 12:33:03 jmcneill Exp $");
#include "opt_memsize.h"
#include "opt_kmempages.h"
-#include "opt_urkelvisor.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -41,10 +40,6 @@
#include <sys/pool.h>
#include <machine/thunk.h>
-#ifdef URKELVISOR
-#include <machine/urkelvisor.h>
-#endif
-
#include <uvm/uvm.h>
struct pv_entry {
@@ -304,10 +299,6 @@
(uint64_t) (free_end - (free_start + fpos))/1024/1024);
aprint_debug("\t%"PRIu64" MB of kmem left\n",
(uint64_t) (kmem_ext_end - kmem_ext_cur_end)/1024/1024);
-
-#ifdef URKELVISOR
- urkelvisor_init();
-#endif
}
void
