From 772c95a45efcb61caf9939f37f9828a656a32b5c Mon Sep 17 00:00:00 2001
From: Jan Glauber <jan.glauber@de.ibm.com>
Date: Wed, 1 Feb 2006 03:06:32 -0800
Subject: [PATCH] --- yaml --- r: 19438 b: refs/heads/master c:
 9dbafa5368c2b7467bd2ce034b56c54908ceb39e h: refs/heads/master 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 5cb8609e79e6..15cbbdd96d88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e018ba1fceee5bd306e31f6e3a60934d5f143ac5
+refs/heads/master: 9dbafa5368c2b7467bd2ce034b56c54908ceb39e
diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c
index 7c0fe152a111..efba91b015be 100644
--- a/trunk/arch/s390/kernel/time.c
+++ b/trunk/arch/s390/kernel/time.c
@@ -61,7 +61,7 @@ extern unsigned long wall_jiffies;
  */
 unsigned long long sched_clock(void)
 {
-	return ((get_clock() - jiffies_timer_cc) * 1000) >> 12;
+	return ((get_clock() - jiffies_timer_cc) * 125) >> 9;
 }
 
 void tod_to_timeval(__u64 todval, struct timespec *xtime)