diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-10-07 18:42:18 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-10-07 18:42:18 +0000 |
| commit | 4bb26682f70a5f626cad3e0ac82bf4b6252ea7a4 (patch) | |
| tree | 5a5043b1c5c2dd31be2eee9bf8099f90486842db | |
| parent | 2a484ecf8283814c92b5743845e285f0efc23247 (diff) | |
| parent | f1829782d6cb931973d71649f8ad1dad66188c34 (diff) | |
| download | focaccia-qemu-4bb26682f70a5f626cad3e0ac82bf4b6252ea7a4.tar.gz focaccia-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
| -rw-r--r-- | qemu-barrier.h | 2 |
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 |