From owner-p4-projects  Tue Apr  2 12:42:53 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 450D437B41B; Tue,  2 Apr 2002 12:42:44 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 3308337B444
	for <perforce@freebsd.org>; Tue,  2 Apr 2002 12:42:34 -0800 (PST)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g32KgYL13367
	for perforce@freebsd.org; Tue, 2 Apr 2002 12:42:34 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Date: Tue, 2 Apr 2002 12:42:34 -0800 (PST)
Message-Id: <200204022042.g32KgYL13367@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 8914 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8914

Change 8914 by jhb@jhb_laptop on 2002/04/02 12:42:02

	Fix a merge-o.

Affected files ...

... //depot/projects/smpng/sys/ia64/ia64/machdep.c#31 integrate

Differences ...

==== //depot/projects/smpng/sys/ia64/ia64/machdep.c#31 (text+ko) ====

@@ -687,6 +687,9 @@
 	ia64_set_k4((u_int64_t) pcpup);
 	PCPU_SET(curthread, &thread0);
 
+	/* We pretend to own FP state so that ia64_fpstate_check() works */
+	PCPU_SET(fpcurthread, &thread0);
+
 	/*
 	 * Initialize the rest of proc 0's PCB.
 	 *

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message