From 53c867892be7402e78ee2bc0e927bc6a001ab5f3 Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Mon, 22 Oct 2007 10:56:25 +1000 Subject: [PATCH] --- yaml --- r: 72243 b: refs/heads/master c: 05aa026a62d0fe0b4664a01d1537984b12567e7c h: refs/heads/master i: 72241: ac27cf5b900fa9c3fce39ca566363249ac27fa39 72239: 5d7a498943499fc10d924e45beb81065f41c9628 v: v3 --- [refs] | 2 +- trunk/drivers/lguest/lguest.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2a3ba12d0174..b144520393dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebac52524df31e7c2fe13ca5bd3438907842f763 +refs/heads/master: 05aa026a62d0fe0b4664a01d1537984b12567e7c diff --git a/trunk/drivers/lguest/lguest.c b/trunk/drivers/lguest/lguest.c index c9ca610f4996..8e9e485a5cfa 100644 --- a/trunk/drivers/lguest/lguest.c +++ b/trunk/drivers/lguest/lguest.c @@ -679,6 +679,7 @@ static struct clocksource lguest_clock = { .mask = CLOCKSOURCE_MASK(64), .mult = 1 << 22, .shift = 22, + .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; /* The "scheduler clock" is just our real clock, adjusted to start at zero */ @@ -760,11 +761,9 @@ static void lguest_time_init(void) * the TSC, otherwise it's a dumb nanosecond-resolution clock. Either * way, the "rating" is initialized so high that it's always chosen * over any other clocksource. */ - if (lguest_data.tsc_khz) { + if (lguest_data.tsc_khz) lguest_clock.mult = clocksource_khz2mult(lguest_data.tsc_khz, lguest_clock.shift); - lguest_clock.flags = CLOCK_SOURCE_IS_CONTINUOUS; - } clock_base = lguest_clock_read(); clocksource_register(&lguest_clock);