lkml.org 
[lkml]   [2013]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v4 04/17] sched_clock: Add support for >32 bit sched_clock
On 07/19, Baruch Siach wrote:
> On Thu, Jul 18, 2013 at 04:21:17PM -0700, Stephen Boyd wrote:
> > @@ -110,14 +123,13 @@ void __init setup_sched_clock(u32 (*read)(void), int
> > bits, unsigned long rate)
> > if (cd.rate > rate)
> > return;
> >
> > - BUG_ON(bits > 32);
> > WARN_ON(!irqs_disabled());
> > read_sched_clock = read;
> > - sched_clock_mask = (1 << bits) - 1;
> > + sched_clock_mask = CLOCKSOURCE_MASK(bits);
>
> Note that this conflicts with my integer overflow fix
> (http://article.gmane.org/gmane.linux.ports.arm.kernel/252498) that I hope
> will get merged before 3.11 is out.
>

Thanks for the heads up. The conflict looks minor and I'll rebase
if necessary.

--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation


\
 
 \ /
  Last update: 2013-07-19 22:21    [W:0.555 / U:6.320 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site