diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-04-18 17:52:00 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-04-18 17:52:00 +0200 |
| commit | decc49dfad34504a9ff12c721e5fd0baf56a0444 (patch) | |
| tree | 3425650b7f659ba2c9ba3690c8668ebd286075bb /arch/x86/include | |
| parent | 65e6f0b461da6590830416b104c665f147f13178 (diff) | |
| parent | 0527fde0639955203ad48a9fd83bd6fc35e82e07 (diff) | |
| download | kernel_samsung_crespo-decc49dfad34504a9ff12c721e5fd0baf56a0444.tar.gz kernel_samsung_crespo-decc49dfad34504a9ff12c721e5fd0baf56a0444.tar.bz2 kernel_samsung_crespo-decc49dfad34504a9ff12c721e5fd0baf56a0444.zip | |
Merge branch 'linux-3.0.y' into ics
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/timer.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h index 431793e5d48..34baa0eb5d0 100644 --- a/arch/x86/include/asm/timer.h +++ b/arch/x86/include/asm/timer.h @@ -57,14 +57,10 @@ DECLARE_PER_CPU(unsigned long long, cyc2ns_offset); static inline unsigned long long __cycles_2_ns(unsigned long long cyc) { - unsigned long long quot; - unsigned long long rem; int cpu = smp_processor_id(); unsigned long long ns = per_cpu(cyc2ns_offset, cpu); - quot = (cyc >> CYC2NS_SCALE_FACTOR); - rem = cyc & ((1ULL << CYC2NS_SCALE_FACTOR) - 1); - ns += quot * per_cpu(cyc2ns, cpu) + - ((rem * per_cpu(cyc2ns, cpu)) >> CYC2NS_SCALE_FACTOR); + ns += mult_frac(cyc, per_cpu(cyc2ns, cpu), + (1UL << CYC2NS_SCALE_FACTOR)); return ns; } |