Re: [PATCH] futex: Detect mismatched requeue targets

[Darren Hart <dvhltc@us.ibm.com>]

John Kacur wrote:
> ----- "Darren Hart" <dvhltc@us.ibm.com> wrote:
> 
>> John Kacur wrote:
>>> Hello Darren
>>>
>>> I took your patch from commit
>> 84bc4af59081ee974dd80210e694ab59ebe51ce8
>>> and I tried to git-cherry-pick it for v2.6.31.4-rt14
>>>
>>> I had a little merge-commit to resolve. That wasn't too hard, but as
>> the 
>>> code is a bit different between the two versions, I would appreciate
>> it if 
>>> you could review the patch, and make sure that it still makes sense
>> for 
>>> v2.6.31.r-rt14
>> Hi John,
>>
>> It looks good to me.  Where did you have the conflicts?
>>
>> --
> 
> The conflict was in the futex_wait_requeue_pi function.
> That's where you really need to double check that the logic still makes sense.

Hi John,

Yes, I suspect the conflict was do to the retry: label. You should have 
already pulled in the spurious wakeup patch, so you should be fine.  The 
patch looks good to me.

Thanks,

-- 
Darren Hart
IBM Linux Technology Center
Real-Time Linux Team