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 <[email protected]>
Index: linux-2.6.18-mm/arch/um/kernel/time.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/kernel/time.c 2006-09-12 10:43:38.000000000 -0400
+++ linux-2.6.18-mm/arch/um/kernel/time.c 2006-09-22 10:15:45.000000000 -0400
@@ -95,7 +95,7 @@ irqreturn_t um_timer(int irq, void *dev,
do_timer(1);
- 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;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
