Messages in this thread | | | Date | Tue, 17 Dec 2013 15:35:45 +0100 | From | Sebastian Andrzej Siewior <> | Subject | Re: [ANNOUNCE] 3.12.5-rt6 |
| |
On 12/17/2013 03:26 PM, Mike Galbraith wrote: > On Tue, 2013-12-17 at 09:16 -0500, Steven Rostedt wrote: >> >>> @@ -1129,11 +1127,8 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state) >>> * is actually now running somewhere else! >>> */ >>> while (task_running(rq, p)) { >>> - if (match_state) { >>> - if (!unlikely(check_task_state(p, match_state))) >>> - return 0; >>> + if (match_state && !check_task_state(p, match_state)) >> >> Ah, it was that "!unlikely(" that caused me to miss the '!'. That >> should have been: likely(!check_task_state()). But anyway, I rather >> just keep what you wrote and drop the unlikely altogether. > > Maybe better would be to put the thing back inline, with a brief > reference to the race.
There is similar code in - task_is_stopped_or_traced() - task_is_traced()
and I didn't get around to have one function for this stupid check since the check is always a little different.
> -Mike
Sebastian
| |