diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-12 03:53:34 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-12 03:53:34 -0400 |
| commit | 7a0c58d0513c246ac5438ef4a55ce8b93395ae0e (patch) | |
| tree | d18f58349ced242aa62e622e381e60933f71d451 /include/asm-s390/futex.h | |
| parent | 6218a761bbc27acc65248c80024875bcc06d52b1 (diff) | |
| parent | 289a1e995e74734b5ec76ca8a5490058f4fecc24 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'include/asm-s390/futex.h')
| -rw-r--r-- | include/asm-s390/futex.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/include/asm-s390/futex.h b/include/asm-s390/futex.h index 40c25e166a9b..1802775568b9 100644 --- a/include/asm-s390/futex.h +++ b/include/asm-s390/futex.h | |||
| @@ -11,23 +11,24 @@ | |||
| 11 | #define __futex_atomic_fixup \ | 11 | #define __futex_atomic_fixup \ |
| 12 | ".section __ex_table,\"a\"\n" \ | 12 | ".section __ex_table,\"a\"\n" \ |
| 13 | " .align 4\n" \ | 13 | " .align 4\n" \ |
| 14 | " .long 0b,2b,1b,2b\n" \ | 14 | " .long 0b,4b,2b,4b,3b,4b\n" \ |
| 15 | ".previous" | 15 | ".previous" |
| 16 | #else /* __s390x__ */ | 16 | #else /* __s390x__ */ |
| 17 | #define __futex_atomic_fixup \ | 17 | #define __futex_atomic_fixup \ |
| 18 | ".section __ex_table,\"a\"\n" \ | 18 | ".section __ex_table,\"a\"\n" \ |
| 19 | " .align 8\n" \ | 19 | " .align 8\n" \ |
| 20 | " .quad 0b,2b,1b,2b\n" \ | 20 | " .quad 0b,4b,2b,4b,3b,4b\n" \ |
| 21 | ".previous" | 21 | ".previous" |
| 22 | #endif /* __s390x__ */ | 22 | #endif /* __s390x__ */ |
| 23 | 23 | ||
| 24 | #define __futex_atomic_op(insn, ret, oldval, newval, uaddr, oparg) \ | 24 | #define __futex_atomic_op(insn, ret, oldval, newval, uaddr, oparg) \ |
| 25 | asm volatile(" l %1,0(%6)\n" \ | 25 | asm volatile(" sacf 256\n" \ |
| 26 | "0: " insn \ | 26 | "0: l %1,0(%6)\n" \ |
| 27 | " cs %1,%2,0(%6)\n" \ | 27 | "1: " insn \ |
| 28 | "1: jl 0b\n" \ | 28 | "2: cs %1,%2,0(%6)\n" \ |
| 29 | "3: jl 1b\n" \ | ||
| 29 | " lhi %0,0\n" \ | 30 | " lhi %0,0\n" \ |
| 30 | "2:\n" \ | 31 | "4: sacf 0\n" \ |
| 31 | __futex_atomic_fixup \ | 32 | __futex_atomic_fixup \ |
| 32 | : "=d" (ret), "=&d" (oldval), "=&d" (newval), \ | 33 | : "=d" (ret), "=&d" (oldval), "=&d" (newval), \ |
| 33 | "=m" (*uaddr) \ | 34 | "=m" (*uaddr) \ |