uml: fix bad NTP interaction with clock
PATCH 2/14 uml: fix bad NTP interaction with clock
From 2b95eda726d565d4abe3cac045022d3141a11b23 Mon Sep 17 00:00:00 2001
UML's supposed nanosecond clock interacts badly with NTP when NTP decides that the clock has drifted ahead and needs to be slowed down. Slowing down the clock is done by decrementing the cycle-to-nanosecond multiplier, which is 1. Decrementing that gives you 0 and time is stopped.
This is fixed by switching to a microsecond clock, with a multiplier of 1000.
Signed-off-by Jeff Dike <[email protected]>
Cc WANG Cong <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
Signed-off-by Linus Torvalds <[email protected]>
--- arch/um/kernel/time.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/um/kernel/time.c +2 -2
@@ -74,7 +74,7 @@ static irqreturn_t um_timer(int irq, void *dev)static cycle_t itimer_read (void ) { -return os_nsecs (); +return os_nsecs () /1000 ; }static struct clocksource itimer_clocksource = {
@@ -82,7 +82,7 @@ static struct clocksource itimer_clocksource = { .rating = 300, .read = itimer_read, .mask = CLOCKSOURCE_MASK(64), - .mult = 1, + .mult = 1000, .shift = 0, .flags = CLOCK_SOURCE_IS_CONTINUOUS, };
Signature · 12 lines
1.5.5.1 ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel