diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-11-07 12:00:01 +1100 |
|---|---|---|
| committer | Ajay Nandakumar <anandakumarm@nvidia.com> | 2014-01-13 12:03:39 +0530 |
| commit | 80b9e30787e7426d37af1fab00a5a4c28f3983d3 (patch) | |
| tree | 9dc398f9eedfe325c4781abe99972f7b1b7c00ac /kernel/time | |
| parent | 2ea993bc8616121c520e7d5775043d3f94ec19cc (diff) | |
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.
Bug 1399318
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Cc: Bo Shen <voice.shen@atmel.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
(cherry picked from commit 21e79dee7fe571f59aca2d946032736b0d89ef46)
Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
Change-Id: If9755b79575739f8be1a4a221a05b34f19ef4b78
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/sched_clock.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c index 68b799375981..6c1b5343b26c 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'; |