Commit c1b4098d authored Sep 27, 2006 by Jeff Dike Committed by Linus Torvalds Sep 27, 2006

[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>

parent db9d988e

arch/um/kernel/time.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -95,7 +95,7 @@ irqreturn_t um_timer(int irq, void dev, struct pt_regs regs)

	do_timer(regs);		do_timer(regs);

	nsecs = get_time() + local_offset;		nsecs = get_time();
	xtime.tv_sec = nsecs / NSEC_PER_SEC;		xtime.tv_sec = nsecs / NSEC_PER_SEC;
	xtime.tv_nsec = nsecs - xtime.tv_sec * NSEC_PER_SEC;		xtime.tv_nsec = nsecs - xtime.tv_sec * NSEC_PER_SEC;