diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c index 31de4dd0ee42..69f1d08aac33 100644 --- a/sys/compat/linux/linux_emul.c +++ b/sys/compat/linux/linux_emul.c @@ -87,7 +87,7 @@ linux_proc_init(struct thread *td, pid_t child, int flags) em = malloc(sizeof *em, M_LINUX, M_WAITOK | M_ZERO); em->pid = child; em->pdeath_signal = 0; - em->used_requeue = 0; + em->flags = 0; em->robust_futexes = NULL; if (flags & LINUX_CLONE_THREAD) { /* handled later in the code */ diff --git a/sys/compat/linux/linux_emul.h b/sys/compat/linux/linux_emul.h index 43034ff1d4c3..d517bfd0cd7c 100644 --- a/sys/compat/linux/linux_emul.h +++ b/sys/compat/linux/linux_emul.h @@ -55,7 +55,7 @@ struct linux_emuldata { struct linux_emuldata_shared *shared; int pdeath_signal; /* parent death signal */ - int used_requeue; /* uses deprecated futex op */ + int flags; /* different emuldata flags */ struct linux_robust_list_head *robust_futexes; @@ -76,6 +76,10 @@ struct linux_emuldata *em_find(struct proc *, int locked); #define EMUL_DOLOCK 1 #define EMUL_DONTLOCK 0 +/* emuldata flags */ +#define LINUX_XDEPR_REQUEUEOP 0x00000001 /* uses deprecated + futex REQUEUE op*/ + int linux_proc_init(struct thread *, pid_t, int); void linux_proc_exit(void *, struct proc *); void linux_schedtail(void *, struct proc *); diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index bdc379a57b6c..f2955b085bc4 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -678,11 +678,11 @@ linux_sys_futex(struct thread *td, struct linux_sys_futex_args *args) * FUTEX_REQUEUE returned EINVAL. */ em = em_find(td->td_proc, EMUL_DONTLOCK); - if (em->used_requeue == 0) { + if ((em->flags & LINUX_XDEPR_REQUEUEOP) == 0) { linux_msg(td, "linux_sys_futex: " "unsupported futex_requeue op\n"); - em->used_requeue = 1; + em->flags |= LINUX_XDEPR_REQUEUEOP; } return (EINVAL);