Commit-ID: ce5dae03973461e2a42098c53d62946b98baab42 Gitweb: http://git.kernel.org/tip/ce5dae03973461e2a42098c53d62946b98baab42 Author: Stephen Boyd <sboyd@xxxxxxxxxxxxxx> AuthorDate: Fri, 15 Nov 2013 14:15:28 -0800 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Tue, 19 Nov 2013 19:09:42 +0100 sched_clock: Document 4Mhz vs 1Mhz decision Bo Shen sent a patch to change this to 1Mhz instead of 4Mhz but according to Russell King the use of 4Mhz was intentional. Add a comment to this effect so that others don't try to change the code as well. Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxxxxxx> Cc: Bo Shen <voice.shen@xxxxxxxxx> Cc: Russell King <rmk@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> --- kernel/time/sched_clock.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c index 68b7993..6c1b534 100644 --- a/kernel/time/sched_clock.c +++ b/kernel/time/sched_clock.c @@ -132,6 +132,10 @@ void __init sched_clock_register(u64 (*read)(void), int bits, clocks_calc_mult_shift(&cd.mult, &cd.shift, rate, NSEC_PER_SEC, 3600); r = rate; + /* + * Use 4MHz instead of 1MHz so that things like 1.832Mhz show as + * 1832Khz + */ if (r >= 4000000) { r /= 1000000; r_unit = 'M'; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html