From 4a01f67e04160f10b0f55ed1e4d06f56ec0ea56c Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 9 Aug 2007 20:52:35 +1000
Subject: [PATCH] --- yaml --- r: 63737 b: refs/heads/master c:
 37250097e1b730c30da1790e354c0da65e617043 h: refs/heads/master i:   63735:
 af14616c1104a896aae443c2b08bc32541b5cd2a v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/lguest/lguest.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index be5070cb1913..4cebd4ccf441 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88ffc3505988196ef5cfdc0278ad89025c2a7b1a
+refs/heads/master: 37250097e1b730c30da1790e354c0da65e617043
diff --git a/trunk/drivers/lguest/lguest.c b/trunk/drivers/lguest/lguest.c
index 1bc1546c7fd0..fb17d2757be9 100644
--- a/trunk/drivers/lguest/lguest.c
+++ b/trunk/drivers/lguest/lguest.c
@@ -687,7 +687,8 @@ static struct clocksource lguest_clock = {
 	.rating		= 400,
 	.read		= lguest_clock_read,
 	.mask		= CLOCKSOURCE_MASK(64),
-	.mult		= 1,
+	.mult		= 1 << 22,
+	.shift		= 22,
 };
 
 /* The "scheduler clock" is just our real clock, adjusted to start at zero */
@@ -770,7 +771,6 @@ static void lguest_time_init(void)
 	 * way, the "rating" is initialized so high that it's always chosen
 	 * over any other clocksource. */
 	if (lguest_data.tsc_khz) {
-		lguest_clock.shift = 22;
 		lguest_clock.mult = clocksource_khz2mult(lguest_data.tsc_khz,
 							 lguest_clock.shift);
 		lguest_clock.flags = CLOCK_SOURCE_IS_CONTINUOUS;