PERFORCE change 100593 for review

[John Birrell]

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

Change 100593 by jb at 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();
 }