Skip to content

Commit

Permalink
[PATCH] uml: fix sleep length bug
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Sep 27, 2006
1 parent db9d988 commit c1b4098
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/um/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit c1b4098

Please sign in to comment.