diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-12-02 11:13:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-12-02 11:13:44 +0100 |
| commit | 1b95b1a06cb27badb3e53329fb56af2a2113fd80 (patch) | |
| tree | bbe52b10fde003833c980b0a30dd23b0e0855c87 /arch/tile | |
| parent | x86/paravirt: Optimize native pv_lock_ops.vcpu_is_preempted() (diff) | |
| parent | locking/rtmutex: Use READ_ONCE() in rt_mutex_owner() (diff) | |
| download | linux-1b95b1a06cb27badb3e53329fb56af2a2113fd80.tar.xz linux-1b95b1a06cb27badb3e53329fb56af2a2113fd80.zip | |
Merge branch 'locking/urgent' into locking/core, to pick up dependent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/tile')
| -rw-r--r-- | arch/tile/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c index 178989e6d3e3..ea960d660917 100644 --- a/arch/tile/kernel/time.c +++ b/arch/tile/kernel/time.c @@ -218,8 +218,8 @@ void do_timer_interrupt(struct pt_regs *regs, int fault_num) */ unsigned long long sched_clock(void) { - return clocksource_cyc2ns(get_cycles(), - sched_clock_mult, SCHED_CLOCK_SHIFT); + return mult_frac(get_cycles(), + sched_clock_mult, 1ULL << SCHED_CLOCK_SHIFT); } int setup_profiling_timer(unsigned int multiplier) |