From 3cec81f22972964735a751cc399f6ea08b39d9f7 Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Sat, 20 May 2006 15:00:25 -0700 Subject: [PATCH] --- yaml --- r: 26873 b: refs/heads/master c: 92f63cd000059366af18712367216d96180e0ec0 h: refs/heads/master i: 26871: 32911b7ad6a996c5852b39a6ab18d133877f1dc9 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/time.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6102d3dbcf8b..3c8724bbdbe2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0662b71322e211dba9a4bc0e6fbca7861a2b5a7d +refs/heads/master: 92f63cd000059366af18712367216d96180e0ec0 diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c index 029f09901b85..ce19ad4e92ec 100644 --- a/trunk/arch/s390/kernel/time.c +++ b/trunk/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. */