diff options
author | Jeff Dike <jdike@addtoit.com> | 2006-09-27 04:50:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 11:26:16 -0400 |
commit | c1b4098d4852f823ecf1abb2d369cb1beb902653 (patch) | |
tree | 599e7ebe0316ec8a4592a9b4d7cb9f72b03715d9 /arch/um | |
parent | db9d988eaa48fa8d64cf3234a301eb9406b91de1 (diff) |
[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>
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index 2454bbd9555d..820affbf3e16 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) | |||
95 | 95 | ||
96 | do_timer(regs); | 96 | do_timer(regs); |
97 | 97 | ||
98 | nsecs = get_time() + local_offset; | 98 | nsecs = get_time(); |
99 | xtime.tv_sec = nsecs / NSEC_PER_SEC; | 99 | xtime.tv_sec = nsecs / NSEC_PER_SEC; |
100 | xtime.tv_nsec = nsecs - xtime.tv_sec * NSEC_PER_SEC; | 100 | xtime.tv_nsec = nsecs - xtime.tv_sec * NSEC_PER_SEC; |
101 | 101 | ||