From owner-p4-projects@FreeBSD.ORG  Wed Jul  5 01:53:21 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 42F9816A4EA; Wed,  5 Jul 2006 01:53:21 +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 1C73616A4E7
	for <perforce@freebsd.org>; Wed,  5 Jul 2006 01:53:21 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9447B43D53
	for <perforce@freebsd.org>; Wed,  5 Jul 2006 01:53:20 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k651rK8D033443
	for <perforce@freebsd.org>; Wed, 5 Jul 2006 01:53:20 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k651rKIc033440
	for perforce@freebsd.org; Wed, 5 Jul 2006 01:53:20 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 5 Jul 2006 01:53:20 GMT
Message-Id: <200607050153.k651rKIc033440@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 100593 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, 05 Jul 2006 01:53:21 -0000

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

Change 100593 by jb@jb_freebsd2 on 2006/07/05 01:53:10

	Make this file compile again.

Affected files ...

.. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#5 edit

Differences ...

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

@@ -383,7 +383,6 @@
 pmap_activate(struct thread *td)
 {
 	pmap_t pmap, oldpmap;
-	int context, err;
 	int err;
 	
 	critical_enter();
@@ -402,14 +401,11 @@
 	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);
-	context = pmap->pm_context;
 	if (pmap->pm_context != 0)
 		if ((err = hv_set_ctxnon0(1, pmap->pm_tsb_ra)) != H_EOK)
 			panic("failed to set TSB 0x%lx - context == %ld\n", 
 			      pmap->pm_tsb_ra, pmap->pm_context);
-			panic("failed to set TSB 0x%lx - context == %d\n", 
-			      pmap->pm_tsb_ra, context);
-	stxa(MMU_CID_S, ASI_MMU_CONTEXTID, context);
+	stxa(MMU_CID_S, ASI_MMU_CONTEXTID, pmap->pm_context);
 	membar(Sync);
 	critical_exit();
 }