Commit cfd28f66 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

uml: fix bad NTP interaction with clock

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: default avatarJeff Dike <jdike@linux.intel.com>
Cc: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 309e96cd
...@@ -75,7 +75,7 @@ static irqreturn_t um_timer(int irq, void *dev) ...@@ -75,7 +75,7 @@ static irqreturn_t um_timer(int irq, void *dev)
static cycle_t itimer_read(void) static cycle_t itimer_read(void)
{ {
return os_nsecs(); return os_nsecs() / 1000;
} }
static struct clocksource itimer_clocksource = { static struct clocksource itimer_clocksource = {
...@@ -83,7 +83,7 @@ static struct clocksource itimer_clocksource = { ...@@ -83,7 +83,7 @@ static struct clocksource itimer_clocksource = {
.rating = 300, .rating = 300,
.read = itimer_read, .read = itimer_read,
.mask = CLOCKSOURCE_MASK(64), .mask = CLOCKSOURCE_MASK(64),
.mult = 1, .mult = 1000,
.shift = 0, .shift = 0,
.flags = CLOCK_SOURCE_IS_CONTINUOUS, .flags = CLOCK_SOURCE_IS_CONTINUOUS,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment