Messages in this thread Patch in this message | | | Date | Thu, 5 Aug 2021 09:00:08 +0200 | From | Daniel Wagner <> | Subject | Re: [ANNOUNCE] v5.14-rc4-rt5 |
| |
On Thu, Aug 05, 2021 at 08:53:53AM +0200, Daniel Wagner wrote: > On Thu, Aug 05, 2021 at 08:31:23AM +0200, Daniel Wagner wrote: > > Just a heads up. I get these build errors: > > I suppose this should be:
and while at it, there are two more compile errors. The first one is obvious, the second one is just guessing.
diff --git a/kernel/futex.c b/kernel/futex.c index c05a33a2f865..41e3d63160a7 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -1896,14 +1896,14 @@ static inline void futex_requeue_pi_complete(struct futex_q *q, int locked) if (locked >= 0) { /* Requeue succeeded. Set DONE or LOCKED */ WARN_ON_ONCE(old != Q_REQUEUE_PI_IN_PROGRESS && - old != Q_REQUEUE_PI_WAIT) + old != Q_REQUEUE_PI_WAIT); new = Q_REQUEUE_PI_DONE + locked; } else if (old == Q_REQUEUE_PI_IN_PROGRESS) { /* Deadlock, no early wakeup interleave */ new = Q_REQUEUE_PI_NONE; } else { /* Deadlock, early wakeup interleave. */ - WARN_ON_ONCE(old != Q_REQUEUE_PI_IN_WAIT); + WARN_ON_ONCE(old != Q_REQUEUE_PI_WAIT); new = Q_REQUEUE_PI_IGNORE; } } while (!atomic_try_cmpxchg(&q->requeue_state, &old, new));
| |