diff options
| author | Jeff Dike <jdike@addtoit.com> | 2006-09-27 01:50:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 08:26:16 -0700 |
| commit | c1b4098d4852f823ecf1abb2d369cb1beb902653 (patch) | |
| tree | 599e7ebe0316ec8a4592a9b4d7cb9f72b03715d9 /arch/um/kernel | |
| parent | db9d988eaa48fa8d64cf3234a301eb9406b91de1 (diff) | |
| download | kernel-crypto-c1b4098d4852f823ecf1abb2d369cb1beb902653.tar.gz kernel-crypto-c1b4098d4852f823ecf1abb2d369cb1beb902653.tar.xz kernel-crypto-c1b4098d4852f823ecf1abb2d369cb1beb902653.zip | |
[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/kernel')
| -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 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; |