svn commit: r225760 - stable/8/sys/sparc64/sparc64

[Attilio Rao]

Author: attilio
Date: Mon Sep 26 10:12:16 2011
New Revision: 225760
URL: http://svn.freebsd.org/changeset/base/225760

Log:
  MFC r225675:
  Initialize the pmap lock for the kernel pmap when it is really
  appropriate.

Modified:
  stable/8/sys/sparc64/sparc64/machdep.c
  stable/8/sys/sparc64/sparc64/pmap.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/sparc64/sparc64/machdep.c
==============================================================================
--- stable/8/sys/sparc64/sparc64/machdep.c	Mon Sep 26 07:38:01 2011	(r225759)
+++ stable/8/sys/sparc64/sparc64/machdep.c	Mon Sep 26 10:12:16 2011	(r225760)
@@ -596,11 +596,6 @@ sparc64_init(caddr_t mdp, u_long o1, u_l
 	wrpr(pil, 0, 0);
 	wrpr(pstate, 0, PSTATE_KERNEL);
 
-	/*
-	 * Finish pmap initialization now that we're ready for mutexes.
-	 */
-	PMAP_LOCK_INIT(kernel_pmap);
-
 	OF_getprop(root, "name", sparc64_model, sizeof(sparc64_model) - 1);
 
 	kdb_init();

Modified: stable/8/sys/sparc64/sparc64/pmap.c
==============================================================================
--- stable/8/sys/sparc64/sparc64/pmap.c	Mon Sep 26 07:38:01 2011	(r225759)
+++ stable/8/sys/sparc64/sparc64/pmap.c	Mon Sep 26 10:12:16 2011	(r225760)
@@ -671,11 +671,9 @@ pmap_bootstrap(u_int cpu_impl)
 
 	/*
 	 * Initialize the kernel pmap (which is statically allocated).
-	 * NOTE: PMAP_LOCK_INIT() is needed as part of the initialization
-	 * but sparc64 start up is not ready to initialize mutexes yet.
-	 * It is called in machdep.c.
 	 */
 	pm = kernel_pmap;
+	PMAP_LOCK_INIT(pm);
 	for (i = 0; i < MAXCPU; i++)
 		pm->pm_context[i] = TLB_CTX_KERNEL;
 	pm->pm_active = ~0;