diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 19:09:03 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 19:09:03 +0100 |
| commit | 58daf18cdcab550262a5f4681e1f1e073e21965a (patch) | |
| tree | 2096324b947761a567dd451f33664f17ee1de2cd /kernel | |
| parent | Merge branches 'mmci' and 'pl011-dma' into devel (diff) | |
| parent | ARM: vexpress: add sched_clock() for Versatile Express (diff) | |
| download | linux-58daf18cdcab550262a5f4681e1f1e073e21965a.tar.xz linux-58daf18cdcab550262a5f4681e1f1e073e21965a.zip | |
Merge branch 'clksrc' into devel
Conflicts:
arch/arm/mach-vexpress/v2m.c
arch/arm/plat-omap/counter_32k.c
arch/arm/plat-versatile/Makefile
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/clocksource.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index c18d7efa1b4b..df140cd3ea47 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c @@ -152,6 +152,7 @@ clocks_calc_mult_shift(u32 *mult, u32 *shift, u32 from, u32 to, u32 minsec) */ for (sft = 32; sft > 0; sft--) { tmp = (u64) to << sft; + tmp += from / 2; do_div(tmp, from); if ((tmp >> sftacc) == 0) break; |