On 24/02/12 17:09, David Brown wrote: > On Fri, Feb 24, 2012 at 10:11:14AM +0000, Marc Zyngier wrote: >> On 22/02/12 21:55, David Brown wrote: >>> On Tue, Feb 21, 2012 at 05:39:37PM -0800, Stephen Boyd wrote: >>>> Now that sched_clock is mandatory on ARM it's simple to add >>>> sched_clock support to the MSM timer code. Add it so that we get >>>> more accurate sched_clock output than the jiffies based version >>>> that's provided by default. >>>> >>>> Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxxxxxx> >>>> Cc: Marc Zyngier <marc.zyngier@xxxxxxx> >>>> Cc: David Brown <davidb@xxxxxxxxxxxxxx> >>> >>> Marc, are you able to pull this into your series, so they can all go >>> in together? If so: >>> >>> Acked-by: David Brown <davidb@xxxxxxxxxxxxxx> >> >> David, Stephen, >> >> Russell already pulled my sched_clock() patch series, so I'm not sure it >> is actually useful for me to carry it (and there is actually no >> dependency between this patch and the series). Maybe putting it in the >> patch system or via armsoc would be best? >> >> Otherwise: >> Acked-by: Marc Zyngier <marc.zyngier@xxxxxxx> > > I'll keep an eye on it then, and push it into the ARM soc tree when > the dependencies are there. The whole thing is that there's no dependency. The sched_clock() stuff has hit mainline during the merge window. This patch could go in right now, without any harm. What Russell pulled is just a cleanup to convert the last two platforms having their own sched_clock() and not relying on our framework. M. -- Jazz is not dead. It just smells funny... -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html