From: Jeff Dike <jdike@addtoit.com>
Date: Wed, 27 Sep 2006 08:50:42 +0000 (-0700)
Subject: [PATCH] uml: fix sleep length bug
X-Git-Tag: v2.6.19-rc1~932
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c1b4098d4852f823ecf1abb2d369cb1beb902653;p=linux-2.6-omap-h63xx.git

[PATCH] uml: fix sleep length bug

um_timer shouldn't add local_offset to the host time since get_time already
did it.  This threw off sleep when a settimeofday or equivalent had happened.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index 2454bbd9555..820affbf3e1 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -95,7 +95,7 @@ irqreturn_t um_timer(int irq, void *dev, struct pt_regs *regs)
 
 	do_timer(regs);
 
-	nsecs = get_time() + local_offset;
+	nsecs = get_time();
 	xtime.tv_sec = nsecs / NSEC_PER_SEC;
 	xtime.tv_nsec = nsecs - xtime.tv_sec * NSEC_PER_SEC;