On Thu, Jul 21, 2016 at 02:27:50PM +0800, Huacai Chen wrote: > Don't register r4k sched clock when CPUFREQ enabled because sched clock > need a constant frequency. > > Cc: stable@xxxxxxxxxxxxxxx > Signed-off-by: Huacai Chen <chenhc@xxxxxxxxxx> > --- > arch/mips/kernel/csrc-r4k.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c > index 1f91056..5131b98 100644 > --- a/arch/mips/kernel/csrc-r4k.c > +++ b/arch/mips/kernel/csrc-r4k.c > @@ -82,7 +82,9 @@ int __init init_r4k_clocksource(void) > > clocksource_register_hz(&clocksource_mips, mips_hpt_frequency); > > +#ifndef CONFIG_CPUFREQ > sched_clock_register(r4k_read_sched_clock, 32, mips_hpt_frequency); > +#endif There is no config symbol CONFIG_CPUFREQ and I think if the clock may change, we shouldn't register it as csrc or cevt. Ralf
