---

yaml --- r: 26971 b: refs/heads/master c: 705af30 h: refs/heads/master i: 26969: 2a54a67 26967: 2a68ea8 v: v3
git-mirror · May 25, 2006 · aef9fde · aef9fde
1 parent 9955c5d
commit aef9fde
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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. */