From aef9fde23e30c7afcb7ed0355da3af7fb56a9245 Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Tue, 23 May 2006 09:22:42 +0200 Subject: [PATCH] --- yaml --- r: 26971 b: refs/heads/master c: 705af309505681f197f81618440954d10f120dc0 h: refs/heads/master i: 26969: 2a54a671c92d1d133fce68be4c172146e1e7a4f1 26967: 2a68ea8c7765c1bf8ceec16d9a8ac8009f5e4a1c 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 8f6378982c4c..9145f71a3aca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8bd60705aa17a998516837d9c1e503ad4cbd7fc +refs/heads/master: 705af309505681f197f81618440954d10f120dc0 diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c index ce19ad4e92ec..2a6c6efb6865 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) - (__u64 jiffies) + jiffies_64; + timer = ((__u64) next) - ((__u64) jiffies) + jiffies_64; } while (read_seqretry_irqrestore(&xtime_lock, seq, flags)); todval = -1ULL; /* Be careful about overflows. */