diff options
| author | Clark Williams <williams@redhat.com> | 2012-04-14 09:13:39 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-14 09:13:39 -0500 |
| commit | 4905660cd237e4c4ede46920851caa12739f006f (patch) | |
| tree | ef37e7c9f52c9ae9c2b206658556f37d67fe43eb /arch/x86/include/asm/timer.h | |
| parent | 1b5e39fc18a1b8ff7ea425ce5f49307cb28a880f (diff) | |
| parent | 0147c2ae9d602b5791dae30322ece475271acd10 (diff) | |
Merge commit 'v3.2.15' into rt-3.2.15-rt24v3.2.15-rt24
Diffstat (limited to 'arch/x86/include/asm/timer.h')
| -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 431793e5d484..34baa0eb5d0c 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; } |