Re: [tip:core/urgent] futex: Update woken requeued futex_q lock_ptr

[Darren Hart <dvhltc@xxxxxxxxxx>]

Ingo Molnar wrote:
> * tip-bot for Darren Hart <dvhltc@xxxxxxxxxx> wrote:
>
> > @@ -1030,6 +1034,11 @@ void requeue_pi_wake_futex(struct futex_q *q, union futex_key *key)
> >  	WARN_ON(!q->rt_waiter);
> >  	q->rt_waiter = NULL;
> >  
> > +	q->lock_ptr = &hb->lock;
> > +#ifdef CONFIG_DEBUG_PI_LIST
> > +	q->list.plist.slock = &hb->lock;
> > +#endif
> > +
> >  	wake_up_state(q->task, TASK_NORMAL);
> >  }
> >  
>
> -tip testing found a build error with v2 of the patch:
>
> kernel/futex.c: In function ‘requeue_pi_wake_futex’:
> kernel/futex.c:1039: error: ‘struct plist_head’ has no member named ‘slock’

I've been developing on -rt, and the plist implementation changed with:

34ca9f9b  spinlocks: Create atomic_spinlock and convert rq->lock

Apologies for not catching that.  I'll send out V3 of this patch, one 
for mainline, and one for -rt.  Is prefacing the patch with [RT] the 
preferred way to distinguish mainline and -rt patches?

Thanks,

--
Darren Hart
IBM Linux Technology Center
Real-Time Linux Team
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html