summaryrefslogtreecommitdiffstats
path: root/qemu-barrier.h
diff options
context:
space:
mode:
authorBlue Swirl2012-10-07 20:42:18 +0200
committerBlue Swirl2012-10-07 20:42:18 +0200
commit4bb26682f70a5f626cad3e0ac82bf4b6252ea7a4 (patch)
tree5a5043b1c5c2dd31be2eee9bf8099f90486842db /qemu-barrier.h
parenttarget-sparc: Optimize conditionals using SUBCC (diff)
parentqemu-barrier: Fix compilation on i386 hosts (diff)
downloadqemu-4bb26682f70a5f626cad3e0ac82bf4b6252ea7a4.tar.gz
qemu-4bb26682f70a5f626cad3e0ac82bf4b6252ea7a4.tar.xz
qemu-4bb26682f70a5f626cad3e0ac82bf4b6252ea7a4.zip
Merge branch 'master' of git.qemu.org:/pub/git/qemu
* 'master' of git.qemu.org:/pub/git/qemu: qemu-barrier: Fix compilation on i386 hosts
Diffstat (limited to 'qemu-barrier.h')
-rw-r--r--qemu-barrier.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-barrier.h b/qemu-barrier.h
index 1de914e882..faa83d265e 100644
--- a/qemu-barrier.h
+++ b/qemu-barrier.h
@@ -6,7 +6,7 @@
#if defined(__i386__)
-#include "qemu-common.h" /* QEMU_GNUC_PREREQ */
+#include "compiler.h" /* QEMU_GNUC_PREREQ */
/*
* Because of the strongly ordered x86 storage model, wmb() and rmb() are nops