From owner-p4-projects@FreeBSD.ORG  Wed Mar 22 16:53:44 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2AFEE16A427; Wed, 22 Mar 2006 16:53:44 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DB13416A41F
	for <perforce@freebsd.org>; Wed, 22 Mar 2006 16:53:43 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8841443DC1
	for <perforce@freebsd.org>; Wed, 22 Mar 2006 16:53:10 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2MGqeLx077964
	for <perforce@freebsd.org>; Wed, 22 Mar 2006 16:52:40 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2MGqe9F077961
	for perforce@freebsd.org; Wed, 22 Mar 2006 16:52:40 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 22 Mar 2006 16:52:40 GMT
Message-Id: <200603221652.k2MGqe9F077961@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 93796 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Mar 2006 16:53:44 -0000

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

Change 93796 by kmacy@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++;