From: Jan Glauber Date: Wed, 1 Feb 2006 11:06:32 +0000 (-0800) Subject: [PATCH] s390: overflow in sched_clock X-Git-Tag: v2.6.16-rc2~41 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9dbafa5368c2b7467bd2ce034b56c54908ceb39e;p=linux-2.6-omap-h63xx.git [PATCH] s390: overflow in sched_clock The least significant bit of the TOD clock value returned by get_clock is the 4096th part of a microsecond. To get to nanoseconds the value needs to be divided by 4096 and multiplied with 1000. The current method multiplies first and then shifts the value to make the result as precise as possible. The disadvantage is that the multiplication with 1000 will overflow shortly after 52 days. sched_clock is used by the scheduler for time stamp deltas, if an overflow occurs between two time stamps the scheduler will get confused. With the patch the problem occurs only after approx. one year, so the chance to run into this overflow is extremly low. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index 7c0fe152a11..efba91b015b 100644 --- a/arch/s390/kernel/time.c +++ b/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)