From owner-p4-projects@FreeBSD.ORG  Sat Mar 11 10:36:24 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 3AFB216A422; Sat, 11 Mar 2006 10:36:24 +0000 (GMT)
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 146DA16A41F
	for <perforce@freebsd.org>; Sat, 11 Mar 2006 10:36:24 +0000 (GMT)
	(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 4C55D43D4C
	for <perforce@freebsd.org>; Sat, 11 Mar 2006 10:36:22 +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 k2BAaLnW087642
	for <perforce@freebsd.org>; Sat, 11 Mar 2006 10:36:22 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2BAaJDQ087637
	for perforce@freebsd.org; Sat, 11 Mar 2006 10:36:19 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 11 Mar 2006 10:36:19 GMT
Message-Id: <200603111036.k2BAaJDQ087637@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 93144 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: Sat, 11 Mar 2006 10:36:24 -0000

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

Change 93144 by kmacy@kmacy_storage:sun4v_work on 2006/03/11 10:35:19

	make sure user wstate gets set correctly

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/vm_machdep.c#5 edit

Differences ...

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

@@ -85,6 +85,7 @@
 #include <machine/pcb.h>
 #include <machine/tlb.h>
 #include <machine/tstate.h>
+#include <machine/wstate.h>
 
 #ifndef NSFBUFS
 #define	NSFBUFS		(512 + maxusers * 16)
@@ -283,7 +284,9 @@
 	tf->tf_out[1] = 0;
 	tf->tf_tstate &= ~TSTATE_XCC_C;		/* success */
 	tf->tf_fprs = 0;
+	tf->tf_wstate = WSTATE_U64;
 
+
 	td2->td_frame = tf;
 	fp = (struct frame *)tf - 1;
 	fp->fr_local[0] = (u_long)fork_return;
@@ -293,7 +296,6 @@
 	fp->fr_pc = fp->fr_fp = 0;
 	pcb2->pcb_sp = (u_long)fp - SPOFF;
 	pcb2->pcb_pc = (u_long)fork_trampoline - 8;
-
 	/* Setup to release sched_lock in fork_exit(). */
 	td2->td_md.md_spinlock_count = 1;
 	td2->td_md.md_saved_pil = 0;