From 35b95c78ef45841af7a683a7582062384829ece9 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Mon, 7 Oct 2019 11:47:19 +0100 Subject: [PATCH] sim-se: fix futexFunc TGT_FUTEX_WAIT always selects bitset Change-Id: I3e2bd1dd34d7cc00b2685547ab74b56bd8126128 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/21605 Reviewed-by: Brandon Potter Maintainer: Brandon Potter Tested-by: kokoro --- src/sim/syscall_emul.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh index 91ddb2567..66ca28f82 100644 --- a/src/sim/syscall_emul.hh +++ b/src/sim/syscall_emul.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2013, 2015 ARM Limited + * Copyright (c) 2012-2013, 2015, 2019 ARM Limited * Copyright (c) 2015 Advanced Micro Devices, Inc. * All rights reserved * @@ -368,7 +368,7 @@ futexFunc(SyscallDesc *desc, int callnum, ThreadContext *tc) if (val != mem_val) return -OS::TGT_EWOULDBLOCK; - if (OS::TGT_FUTEX_WAIT) { + if (OS::TGT_FUTEX_WAIT == op) { futex_map.suspend(uaddr, process->tgid(), tc); } else { futex_map.suspend_bitset(uaddr, process->tgid(), tc, val3); -- 2.30.2