Re: paravirt repo rebased to 2.6.21-rc6-mm1

[Chris Wright <chrisw@sous-sol.org>]

* Zachary Amsden (zach@vmware.com) wrote:
> Jeremy Fitzhardinge wrote:
> >Seems to work OK for native and Xen.  I had to play a bit with the
> >paravirt-sched-clock patch to deal with the VMI changes.  Zach, can you
> >check that it still works?
> 
> I'm on it.

Not sure about cycles_2_ns...

arch/i386/kernel/built-in.o: In function `activate_vmi':
/home/chrisw/hg/xen/linux-2.6-pv/arch/i386/kernel/vmi.c:894: undefined reference to `vmi_sched_clock'

diff -r a5e50a2e914a arch/i386/kernel/vmiclock.c
--- a/arch/i386/kernel/vmiclock.c	Tue Apr 10 16:20:13 2007 -0700
+++ b/arch/i386/kernel/vmiclock.c	Tue Apr 10 17:07:47 2007 -0700
@@ -64,10 +64,10 @@ int vmi_set_wallclock(unsigned long now)
 	return 0;
 }
 
-/* paravirt_ops.get_scheduled_cycles = vmi_get_sched_cycles */
-unsigned long long vmi_get_sched_cycles(void)
-{
-	return vmi_timer_ops.get_cycle_counter(VMI_CYCLES_AVAILABLE);
+unsigned long long vmi_sched_clock(void)
+{
+	cycle_t cycles = vmi_timer_ops.get_cycle_counter(VMI_CYCLES_AVAILABLE);
+	return cycles_2_ns(cycles);
 }
 
 /* paravirt_ops.get_cpu_khz = vmi_cpu_khz */