On 06/05/2013 07:15 PM, Peter Zijlstra wrote: > On Tue, Jun 04, 2013 at 02:23:39PM +0800, Michael Wang wrote: >> Directly use rq to save some code. >> >> CC: Ingo Molnar <mi...@kernel.org> >> CC: Peter Zijlstra <pet...@infradead.org> >> Signed-off-by: Michael Wang <wang...@linux.vnet.ibm.com> > > Please send patches against tip/master; the below didn't apply cleanly. > It was a trivial conflict so I applied force and made it fit.
My sincere apologies on that, please allow me to resend the accepted patches based on latest tip/master, forgive me for create extra work like that... Regards, Michael Wang > > Thanks! > >> --- >> kernel/sched/fair.c | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c >> index c61a614..1e10911 100644 >> --- a/kernel/sched/fair.c >> +++ b/kernel/sched/fair.c >> @@ -2298,7 +2298,7 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) >> int enqueue = 1; >> long task_delta; >> >> - se = cfs_rq->tg->se[cpu_of(rq_of(cfs_rq))]; >> + se = cfs_rq->tg->se[cpu_of(rq)]; >> >> cfs_rq->throttled = 0; >> raw_spin_lock(&cfs_b->lock); >> -- >> 1.7.4.1 >> > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
