Message ID | 1454507865-27428-1-git-send-email-luis.henriques@canonical.com |
---|---|
State | New |
Headers | show |
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 32d8d6aaedb8..268428930c99 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -178,8 +178,7 @@ static inline s64 timekeeping_get_ns(struct timekeeper *tk) /* calculate the delta since the last update_wall_time: */ cycle_delta = (cycle_now - clock->cycle_last) & clock->mask; - nsec = cycle_delta * tk->mult + tk->xtime_nsec; - nsec >>= tk->shift; + nsec = (cycle_delta * tk->mult + tk->xtime_nsec) >> tk->shift; /* If arch requires, add in get_arch_timeoffset() */ return nsec + get_arch_timeoffset();