diff options
author | delphij <delphij@FreeBSD.org> | 2015-04-13 20:23:46 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2015-04-13 20:23:46 +0000 |
commit | 5ae5edd44eedb2c3da78c5d9725b14a291a79cb3 (patch) | |
tree | fcdda7a37b8b71be16932412ad668c37bdff5ef4 /sys/contrib | |
parent | fef0a473a692e894970b5daa0a32990f3b7b6e90 (diff) | |
download | FreeBSD-src-5ae5edd44eedb2c3da78c5d9725b14a291a79cb3.zip FreeBSD-src-5ae5edd44eedb2c3da78c5d9725b14a291a79cb3.tar.gz |
Sync with OpenBSD: Use volatile instead of __volatile__.
MFC after: 2 weeks
Diffstat (limited to 'sys/contrib')
-rw-r--r-- | sys/contrib/x86emu/x86emu.c | 4 |
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) |