diff --git a/[refs] b/[refs] index c6e6c71ec234..23e30bbaa600 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 309e96cdf2f2c1a071102e8bdf828a3493e6e50a +refs/heads/master: cfd28f6695d0fc047478480791a21bdd4967f98e diff --git a/trunk/arch/um/kernel/time.c b/trunk/arch/um/kernel/time.c index 0d0cea2ac98d..c3e2f369c33c 100644 --- a/trunk/arch/um/kernel/time.c +++ b/trunk/arch/um/kernel/time.c @@ -75,7 +75,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 = { @@ -83,7 +83,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, };