PERFORCE change 93796 for review

[Kip Macy]

http://perforce.freebsd.org/chv.cgi?CH=93796

Change 93796 by kmacy at kmacy_storage:sun4vtmp on 2006/03/22 16:52:12

	fix pmap_activate

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#33 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#33 (text+ko) ====

@@ -126,6 +126,7 @@
 static struct vm_object pvzone_obj;
 static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0;
 int pmap_debug = 0;
+static int context = 1; /* XXX */
 
 /*
  * Kernel pmap.
@@ -364,9 +365,18 @@
 	oldpmap->pm_active &= ~1;
 	pmap->pm_active |= 1;
 #endif
-	pmap->pm_hashscratch = tte_hash_set_scratchpad_user(pmap->pm_hash);
+#if 0
+	tsb_clear(&pmap->pm_tsb);
+	tte_hash_clear(pmap->pm_hash);
+#endif
+
+	pmap->pm_context = context++;
+	pmap->pm_hashscratch = tte_hash_set_scratchpad_user(pmap->pm_hash, pmap->pm_context);
 	pmap->pm_tsbscratch = tsb_set_scratchpad_user(&pmap->pm_tsb);
 	PCPU_SET(curpmap, pmap);
+	hv_set_ctxnon0(1, pmap->pm_tsb_ra);
+	stxa(MMU_CID_S, ASI_MMU_CONTEXTID, pmap->pm_context);
+	membar(Sync);
 	critical_exit();
 }
 
@@ -1289,7 +1299,6 @@
 void
 pmap_pinit(pmap_t pmap)
 {
-	static int context = 1; /* XXX */
 
 	pmap->pm_context = context++;