diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2006-06-08 04:36:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-08 18:15:30 -0400 |
| commit | bafe00cc9297ca77b66e5c83e5e65e17c0c997c8 (patch) | |
| tree | c0478b45a084464c515a3201b109d7589773670b /include | |
| parent | 71601e2b33dad9acb8d7844f7321f90ed9d1bce8 (diff) | |
[PATCH] s390: fix in-user atomic futex operation.
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
__futex_atomic_op needs to do an atomic operation in the user address space,
not the kernel address space. Add the missing sacf 256/sacf 0 to switch to
the secondary mode before doing the compare-and-swap. In addition add
another fixup for catch specification exceptions if the compare-and-swap
address is not aligned.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -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) \ |