From owner-p4-projects@FreeBSD.ORG  Fri Aug 31 21:24:30 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0BF08106566C; Fri, 31 Aug 2012 21:24:29 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B7020106566B
	for <perforce@freebsd.org>; Fri, 31 Aug 2012 21:24:28 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 9FDE48FC14
	for <perforce@freebsd.org>; Fri, 31 Aug 2012 21:24:28 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q7VLOS1Z077277
	for <perforce@freebsd.org>; Fri, 31 Aug 2012 21:24:28 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q7VLOSZw077274
	for perforce@freebsd.org; Fri, 31 Aug 2012 21:24:28 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 31 Aug 2012 21:24:28 GMT
Message-Id: <201208312124.q7VLOSZw077274@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 216792 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 31 Aug 2012 21:24:30 -0000

http://p4web.freebsd.org/@@216792?ac=10

Change 216792 by jhb@jhb_jhbbsd on 2012/08/31 21:23:41

	Fix mismerges.

Affected files ...

.. //depot/projects/smpng/sys/amd64/amd64/fpu.c#27 edit
.. //depot/projects/smpng/sys/i386/isa/npx.c#77 edit

Differences ...

==== //depot/projects/smpng/sys/amd64/amd64/fpu.c#27 (text+ko) ====

@@ -115,7 +115,6 @@
 #define	start_emulating()	load_cr0(rcr0() | CR0_TS)
 #define	stop_emulating()	clts()
 
-
 CTASSERT(sizeof(struct savefpu) == 512);
 CTASSERT(sizeof(struct xstate_hdr) == 64);
 CTASSERT(sizeof(struct savefpu_ymm) == 832);

==== //depot/projects/smpng/sys/i386/isa/npx.c#77 (text+ko) ====

@@ -100,6 +100,7 @@
 #define	fxrstor(addr)		__asm __volatile("fxrstor %0" : : "m" (*(addr)))
 #define	fxsave(addr)		__asm __volatile("fxsave %0" : "=m" (*(addr)))
 #define	stmxcsr(addr)		__asm __volatile("stmxcsr %0" : : "m" (*(addr)))
+#endif
 #else	/* !(__GNUCLIKE_ASM && !lint) */
 
 void	fldcw(u_short cw);