diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-01 19:05:23 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-01 19:05:23 +1000 |
| commit | c029cc66cb3d83f70c02e0c182f0eed1419f8020 (patch) | |
| tree | b9ed887a0e6434fedebcbf90b3d2ba1aeff68a01 /arch/s390/kernel/time.c | |
| parent | 0a9cb46a73abd6c45e7c986bec984eed60c417b6 (diff) | |
| parent | ba8f5baba79da8eb502f8534c3a8ecb64aceb790 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/s390/kernel/time.c')
| -rw-r--r-- | arch/s390/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index 029f09901b8..2a6c6efb686 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -272,7 +272,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. */ |