[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20130719162939.GG27430@codeaurora.org>
Date: Fri, 19 Jul 2013 09:29:39 -0700
From: Stephen Boyd <sboyd@...eaurora.org>
To: Baruch Siach <baruch@...s.co.il>
Cc: John Stultz <john.stultz@...aro.org>,
Russell King <linux@....linux.org.uk>,
linux-arm-msm@...r.kernel.org, Will Deacon <will.deacon@....com>,
linux-kernel@...r.kernel.org,
Christopher Covington <cov@...eaurora.org>,
Catalin Marinas <catalin.marinas@....com>,
Thomas Gleixner <tglx@...utronix.de>,
linux-arm-kernel@...ts.infradead.org
Subject: Re: [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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists