Message ID | 20230520162634.3991009-19-richard.henderson@linaro.org |
---|---|
State | New |
Headers | show |
Series | accel/tcg: Improvements to atomic128.h | expand |
On 20.05.23 18:26, Richard Henderson wrote: > Eliminate the CONFIG_USER_ONLY specialization. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > Cc: qemu-s390x@nongnu.org > Cc: David Hildenbrand <david@redhat.com> > Cc: Ilya Leoshkevich <iii@linux.ibm.com> > --- Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index b6cf24403c..bad789a742 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -1798,13 +1798,7 @@ static uint32_t do_csst(CPUS390XState *env, uint32_t r3, uint64_t a1, uint32_t ov; if (parallel) { -#ifdef CONFIG_USER_ONLY - uint32_t *haddr = g2h(env_cpu(env), a1); - ov = qatomic_cmpxchg__nocheck(haddr, cv, nv); -#else - MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN, mem_idx); - ov = cpu_atomic_cmpxchgl_be_mmu(env, a1, cv, nv, oi, ra); -#endif + ov = cpu_atomic_cmpxchgl_be_mmu(env, a1, cv, nv, oi4, ra); } else { ov = cpu_ldl_mmu(env, a1, oi4, ra); cpu_stl_mmu(env, a1, (ov == cv ? nv : ov), oi4, ra);
Eliminate the CONFIG_USER_ONLY specialization. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- Cc: qemu-s390x@nongnu.org Cc: David Hildenbrand <david@redhat.com> Cc: Ilya Leoshkevich <iii@linux.ibm.com> --- target/s390x/tcg/mem_helper.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)