summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2008-11-23 17:48:54 +0200
committerAvi Kivity <avi@redhat.com>2008-11-23 17:48:54 +0200
commitd3088c02f83b8ea4091bf705225549cf79bbbdd0 (patch)
tree29c240cb576f80afd5988f328b390c806cd53390 /qemu-lock.h
parentkvm: testsuite: test simultaneous irq injection (diff)
parenttarget-ppc: convert SPE FP ops to TCG (diff)
downloadqemu-kvm-d3088c02f83b8ea4091bf705225549cf79bbbdd0.tar.gz
qemu-kvm-d3088c02f83b8ea4091bf705225549cf79bbbdd0.tar.bz2
qemu-kvm-d3088c02f83b8ea4091bf705225549cf79bbbdd0.zip
Merge branch 'qemu-cvs'
Conflicts: qemu/block-raw-posix.c qemu/configure qemu/cpu-defs.h qemu/cpu-exec.c qemu/exec.c qemu/gdbstub.c qemu/loader.c qemu/osdep.c qemu/sysemu.h qemu/target-i386/helper.c qemu/target-ppc/cpu.h qemu/target-ppc/helper.c qemu/usb-linux.c Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-lock.h')
-rw-r--r--qemu-lock.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/qemu-lock.h b/qemu-lock.h
index f565565e5..895e712af 100644
--- a/qemu-lock.h
+++ b/qemu-lock.h
@@ -63,12 +63,11 @@ static inline int testandset (int *p)
{
int ret;
__asm__ __volatile__ (
- "0: lwarx %0,0,%1\n"
+ " lwarx %0,0,%1\n"
" xor. %0,%3,%0\n"
- " bne 1f\n"
+ " bne $+12\n"
" stwcx. %2,0,%1\n"
- " bne- 0b\n"
- "1: "
+ " bne- $-16\n"
: "=&r" (ret)
: "r" (p), "r" (1), "r" (0)
: "cr0", "memory");