Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/powerpc/oea Select pmap style before calling oea_init.



details:   https://anonhg.NetBSD.org/src/rev/51213fb27701
branches:  trunk
changeset: 766786:51213fb27701
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Jul 02 00:22:06 2011 +0000

description:
Select pmap style before calling oea_init.

diffstat:

 sys/arch/powerpc/oea/ofwoea_machdep.c |  17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diffs (45 lines):

diff -r 5f82c961917b -r 51213fb27701 sys/arch/powerpc/oea/ofwoea_machdep.c
--- a/sys/arch/powerpc/oea/ofwoea_machdep.c     Fri Jul 01 23:48:20 2011 +0000
+++ b/sys/arch/powerpc/oea/ofwoea_machdep.c     Sat Jul 02 00:22:06 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwoea_machdep.c,v 1.22 2011/06/20 06:21:45 matt Exp $ */
+/* $NetBSD: ofwoea_machdep.c,v 1.23 2011/07/02 00:22:06 matt Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.22 2011/06/20 06:21:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.23 2011/07/02 00:22:06 matt Exp $");
 
 #include "opt_ppcarch.h"
 #include "opt_compat_netbsd.h"
@@ -189,6 +189,13 @@
        }
 #endif
 
+#if defined (PPC_OEA64_BRIDGE) && defined (PPC_OEA)
+       if (oeacpufeat & OEACPU_64_BRIDGE)
+               pmap_setup64bridge();
+       else
+               pmap_setup32();
+#endif
+
        oea_init(pic_ext_intr);
 
        ofmaplen = save_ofmap(NULL, 0);
@@ -209,12 +216,6 @@
 
        uvm_setpagesize();
 
-#if defined (PPC_OEA64_BRIDGE) && defined (PPC_OEA)
-       if (oeacpufeat & OEACPU_64_BRIDGE)
-               pmap_setup64bridge();
-       else
-               pmap_setup32();
-#endif
        pmap_bootstrap(startkernel, endkernel);
 
 /* as far as I can tell, the pmap_setup_seg0 stuff is horribly broken */



Home | Main Index | Thread Index | Old Index