PERFORCE change 213897 for review

[John Baldwin]

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

Change 213897 by jhb at 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);
 }