---

yaml --- r: 26873 b: refs/heads/master c: 92f63cd h: refs/heads/master i: 26871: 32911b7 v: v3
git-mirror · May 21, 2006 · 3cec81f · 3cec81f
1 parent c561c90
commit 3cec81f
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: 0662b71322e211dba9a4bc0e6fbca7861a2b5a7d
+refs/heads/master: 92f63cd000059366af18712367216d96180e0ec0
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 - jiffies) + jiffies_64;
+		timer = (__u64 next) - (__u64 jiffies) + jiffies_64;
 	} while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
 	todval = -1ULL;
 	/* Be careful about overflows. */