From owner-p4-projects@FreeBSD.ORG  Wed Jul  4 16:37:00 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 25B851065676; Wed,  4 Jul 2012 16:36:59 +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 D22331065673
	for <perforce@freebsd.org>; Wed,  4 Jul 2012 16:36:58 +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 B9B0C8FC08
	for <perforce@freebsd.org>; Wed,  4 Jul 2012 16:36:58 +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 q64GawOp024969
	for <perforce@freebsd.org>; Wed, 4 Jul 2012 16:36:58 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q64Gawgl024966
	for perforce@freebsd.org; Wed, 4 Jul 2012 16:36:58 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 4 Jul 2012 16:36:58 GMT
Message-Id: <201207041636.q64Gawgl024966@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 213897 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: Wed, 04 Jul 2012 16:37:00 -0000

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

Change 213897 by jhb@jhb_jhbbsd on 2012/07/04 16:35:56

	Compile.

Affected files ...

.. //depot/projects/smpng/sys/amd64/amd64/db_disasm.c#8 edit
.. //depot/projects/smpng/sys/modules/x86dis/x86dis.c#6 edit

Differences ...

==== //depot/projects/smpng/sys/amd64/amd64/db_disasm.c#8 (text+ko) ====

@@ -1284,7 +1284,7 @@
 			i_size = NONE;
 			i_mode = 0;
 			break;
-		case 0xc3:
+		case 0xc4:
 			i_name = "vmxoff";
 			i_size = NONE;
 			i_mode = 0;

==== //depot/projects/smpng/sys/modules/x86dis/x86dis.c#6 (text+ko) ====

@@ -1,6 +1,7 @@
 #include <sys/types.h>
+#include <machine/cpufunc.h>
 
-//#define NEW_AS
+#define NEW_AS
 
 static __inline void
 xrstor(char *addr, uint64_t mask)
@@ -131,8 +132,8 @@
 	vmcall();
 	vmlaunch();
 	vmresume();
-	lfence();
+	__asm __volatile("lfence" ::: "memory");
 	mfence();
-	sfence();
-	clflush(addr);
+	__asm __volatile("sfence" ::: "memory");
+	clflush((u_long)addr);
 }