---

yaml --- r: 269203 b: refs/heads/master c: e35f95b h: refs/heads/master i: 269201: f6c55e7 269199: 2e23e25 v: v3
git-mirror · Oct 12, 2011 · 412df54 · 412df54
1 parent a590cf1
commit 412df54
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: a1330228f9eec7e355d41f45c17e1297d681f40d
+refs/heads/master: e35f95b36e43f67a6f806172555a152c11ea0a78
diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c
@@ -112,7 +112,7 @@ static void fixup_clock_comparator(unsigned long long delta)
 static int s390_next_ktime(ktime_t expires,
 			   struct clock_event_device *evt)
 {
-	s64 nsecs;
+	u64 nsecs;
 
 	nsecs = ktime_to_ns(ktime_sub(expires, ktime_get_monotonic_offset()));
 	do_div(nsecs, 125);