diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-07-13 17:01:34 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-07-13 17:01:51 +0200 |
| commit | 54f54496779661678d906b57e4cba48239ab7c9b (patch) | |
| tree | feb06330bfa37391a5502e8dc6dfdd58b46b56fb /kernel/time/timekeeping.c | |
| parent | 92d21ac74a9e3c09b0b01c764e530657e4c85c49 (diff) | |
| parent | 1d661bf5327a2c059ec967f850e89362e637f4e6 (diff) | |
| download | op-kernel-dev-54f54496779661678d906b57e4cba48239ab7c9b.zip op-kernel-dev-54f54496779661678d906b57e4cba48239ab7c9b.tar.gz | |
Merge branch 'timers/core' into smp/hotplug to pick up dependencies
Diffstat (limited to 'kernel/time/timekeeping.c')
| -rw-r--r-- | kernel/time/timekeeping.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 479d25c..a196e08 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -480,10 +480,12 @@ static inline void old_vsyscall_fixup(struct timekeeper *tk) * users are removed, this can be killed. */ remainder = tk->tkr_mono.xtime_nsec & ((1ULL << tk->tkr_mono.shift) - 1); - tk->tkr_mono.xtime_nsec -= remainder; - tk->tkr_mono.xtime_nsec += 1ULL << tk->tkr_mono.shift; - tk->ntp_error += remainder << tk->ntp_error_shift; - tk->ntp_error -= (1ULL << tk->tkr_mono.shift) << tk->ntp_error_shift; + if (remainder != 0) { + tk->tkr_mono.xtime_nsec -= remainder; + tk->tkr_mono.xtime_nsec += 1ULL << tk->tkr_mono.shift; + tk->ntp_error += remainder << tk->ntp_error_shift; + tk->ntp_error -= (1ULL << tk->tkr_mono.shift) << tk->ntp_error_shift; + } } #else #define old_vsyscall_fixup(tk) |
