X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Fs390%2Fkernel%2Ftime.c;h=f7fe9bc43397414f58767132a96c261405f92b16;hb=05668381140309088443bf5dc53add4104610fbb;hp=029f09901b851fbd561e18d3be858e805df2bcb8;hpb=badc48e6605ddeeb2484afae5993c859494decaa;p=linux-2.6 diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index 029f09901b..f7fe9bc433 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -12,7 +12,6 @@ * Copyright (C) 1991, 1992, 1995 Linus Torvalds */ -#include #include #include #include @@ -272,7 +271,7 @@ static inline void stop_hz_timer(void) next = next_timer_interrupt(); do { seq = read_seqbegin_irqsave(&xtime_lock, flags); - timer = (__u64)(next - jiffies) + jiffies_64; + timer = ((__u64) next) - ((__u64) jiffies) + jiffies_64; } while (read_seqretry_irqrestore(&xtime_lock, seq, flags)); todval = -1ULL; /* Be careful about overflows. */