diff options
| author | Avi Kivity <avi@redhat.com> | 2009-01-18 12:36:25 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-01-18 12:36:25 +0200 |
| commit | 931c5ab4bfd044e8dfc264ad4fda6ac62e078316 (patch) | |
| tree | e75853dd4bfa7f1fee2fb1ddbce0510178b0f2a6 /qemu-lock.h | |
| parent | 9d465c50b92626b6b2067597b2d0f38c138baf20 (diff) | |
| parent | 5653494a49db20ca6b22b32fa07a73b9e2f26169 (diff) | |
Merge branch 'qemu-cvs'
Conflicts:
qemu/hw/cirrus_vga.c
qemu/hw/pc.c
qemu/hw/pcnet.c
qemu/hw/vga.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-lock.h')
| -rw-r--r-- | qemu-lock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-lock.h b/qemu-lock.h index bee018a51..b912e79a5 100644 --- a/qemu-lock.h +++ b/qemu-lock.h @@ -58,7 +58,7 @@ static inline void resetlock (spinlock_t *p) #endif -#if defined(__powerpc__) +#if defined(_ARCH_PPC) static inline int testandset (int *p) { int ret; |