From 412df5484a63779ddbaa95dda08aa4d4700483ea Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Thu, 22 Sep 2011 09:19:17 +0200
Subject: [PATCH] --- yaml --- r: 269203 b: refs/heads/master c:
 e35f95b36e43f67a6f806172555a152c11ea0a78 h: refs/heads/master i:   269201:
 f6c55e71d9c921269849d13eaa3a34f9a6dc0d9a   269199:
 2e23e256e7199395217fed137767684739c51af3 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 9d73a299c614..7e0ef94855e9 100644
--- 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
index c53716487e77..8d65bd0383fc 100644
--- 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);