svn commit: r281502 - head/sys/contrib/x86emu

[Xin LI]

Author: delphij
Date: Mon Apr 13 20:23:46 2015
New Revision: 281502
URL: https://svnweb.freebsd.org/changeset/base/281502

Log:
  Sync with OpenBSD: Use volatile instead of __volatile__.
  
  MFC after:	2 weeks

Modified:
  head/sys/contrib/x86emu/x86emu.c

Modified: head/sys/contrib/x86emu/x86emu.c
==============================================================================
--- head/sys/contrib/x86emu/x86emu.c	Mon Apr 13 19:58:11 2015	(r281501)
+++ head/sys/contrib/x86emu/x86emu.c	Mon Apr 13 20:23:46 2015	(r281502)
@@ -1,4 +1,4 @@
-/*	$OpenBSD: x86emu.c,v 1.5 2010/02/17 15:09:47 pirofti Exp $	*/
+/*	$OpenBSD: x86emu.c,v 1.9 2014/06/15 11:04:49 pirofti Exp $	*/
 /*	$NetBSD: x86emu.c,v 1.7 2009/02/03 19:26:29 joerg Exp $	*/
 
 /*
@@ -5250,7 +5250,7 @@ x86emuOp2_pop_FS(struct x86emu *emu)
 static void
 hw_cpuid(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d)
 {
-	__asm__ __volatile__("cpuid"
+	__asm__ volatile("cpuid"
 			     : "=a" (*a), "=b" (*b),
 			       "=c" (*c), "=d" (*d)
 			     : "a" (*a), "c" (*c)