[src/trunk]: src/sys/arch/usermode/usermode move call of urkelvisor_init to m...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ebf18229d29f
branches:  trunk
changeset: 769208:ebf18229d29f
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Sep 03 12:33:02 2011 +0000

description:
move call of urkelvisor_init to main instead of pmap_bootstrap

diffstat:

 sys/arch/usermode/usermode/machdep.c |  17 +++++++++++++----
 sys/arch/usermode/usermode/pmap.c    |  13 ++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diffs (90 lines):

diff -r ef95c59a71fb -r ebf18229d29f sys/arch/usermode/usermode/machdep.c
--- a/sys/arch/usermode/usermode/machdep.c      Sat Sep 03 12:28:45 2011 +0000
+++ b/sys/arch/usermode/usermode/machdep.c      Sat Sep 03 12:33:02 2011 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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();
diff -r ef95c59a71fb -r ebf18229d29f sys/arch/usermode/usermode/pmap.c
--- a/sys/arch/usermode/usermode/pmap.c Sat Sep 03 12:28:45 2011 +0000
+++ b/sys/arch/usermode/usermode/pmap.c Sat Sep 03 12:33:02 2011 +0000
@@ -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 <reinoud%NetBSD.org@localhost>
@@ -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