Patch "MIPS: Don't register r4k sched clock when CPUFREQ enabled" has been added to the 4.7-stable tree

This is a note to let you know that I've just added the patch titled

MIPS: Don't register r4k sched clock when CPUFREQ enabled

to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mips-don-t-register-r4k-sched-clock-when-cpufreq-enabled.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Huacai Chen <[email protected]>
Date: Fri, 22 Jul 2016 11:46:31 +0800
Subject: MIPS: Don't register r4k sched clock when CPUFREQ enabled

From: Huacai Chen <[email protected]>

commit 07d69579e7fec27e371296d8ca9d6076fc401b5c upstream.

Don't register r4k sched clock when CPUFREQ enabled because sched clock need a constant frequency.

Patchwork: https://patchwork.linux-mips.org/patch/13820/

---
 arch/mips/kernel/csrc-r4k.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

@@ -23,7 +23,7 @@ static struct clocksource clocksource_mi
 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
-static u64 notrace r4k_read_sched_clock(void)
+static u64 __maybe_unused notrace r4k_read_sched_clock(void)
 {
 	return read_c0_count();
 }

@@ -82,7 +82,9 @@ int __init init_r4k_clocksource(void)
 
 	clocksource_register_hz(&clocksource_mips, mips_hpt_frequency);
 
+#ifndef CONFIG_CPU_FREQ
 	sched_clock_register(r4k_read_sched_clock, 32, mips_hpt_frequency);
+#endif
 
 	return 0;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.7/mips-hpet-increase-hpet_min_prog_delta-and-decrease-hpet_min_cycles.patch queue-4.7/mips-fix-r4k-clockevents-registration.patch queue-4.7/mips-don-t-register-r4k-sched-clock-when-cpufreq-enabled.patch