Subject: Re: linux-next: manual merge of the kvm tree

From: Stephen Rothwell <[email-masked]>
Date: Sat, 13 Sep 2008 05:59:06 +1000

Hi all,

On Sat, 13 Sep 2008 05:50:17 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> Just contextual. I fixed it up (see below) and can carry the fix.

Oops, I needed to add the below as well.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/

diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
index 6a961e3..944c435 100644
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
@@ -207,7 +207,7 @@ static int __pit_timer_fn(struct kvm_kpit_state *ps)
 	hrtimer_add_expires_ns(&pt->timer, pt->period);
 	pt->scheduled = ktime_to_ns(hrtimer_get_expires(&pt->timer));
 	if (pt->period)
-		ps->channels[0].count_load_time = pt->timer.expires;
+		ps->channels[0].count_load_time = hrtimer_get_expires(&pt->timer);
 
 	return (pt->period == 0 ? 0 : 1);
 }