summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2015-04-27 05:42:14 +0000
committerdelphij <delphij@FreeBSD.org>2015-04-27 05:42:14 +0000
commit46cfc43957262d05d929c74db1163a22feea4ca3 (patch)
treef713bbb5c159ff202d6fe2eb62367f8c36f32f76 /sys/contrib
parente8ff65e2ac561fed2737e8a1174939e1ad47dc08 (diff)
downloadFreeBSD-src-46cfc43957262d05d929c74db1163a22feea4ca3.zip
FreeBSD-src-46cfc43957262d05d929c74db1163a22feea4ca3.tar.gz
MFC r281502:
Sync with OpenBSD: Use volatile instead of __volatile__.
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/x86emu/x86emu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/contrib/x86emu/x86emu.c b/sys/contrib/x86emu/x86emu.c
index 87cd777..41e7c4a 100644
--- a/sys/contrib/x86emu/x86emu.c
+++ b/sys/contrib/x86emu/x86emu.c
@@ -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)
OpenPOWER on IntegriCloud