[Xen-changelog] [xen-unstable] [IA64] Fix another bug which causes "Oops: time tick before it's due"

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 9765174339938e4374947e2e6e9eae675c267f22
# Parent  2c7c715ad1856d79e973da4f068a14302718fa5e
[IA64] Fix another bug which causes "Oops: time tick before it's due"

Signed-off-by: Anthony Xu < anthony.xu@xxxxxxxxx >
---
 xen/arch/ia64/vmx/vlsapic.c |    3 +++
 1 files changed, 3 insertions(+)

diff -r 2c7c715ad185 -r 976517433993 xen/arch/ia64/vmx/vlsapic.c
--- a/xen/arch/ia64/vmx/vlsapic.c       Sat Jun 03 14:48:42 2006 -0600
+++ b/xen/arch/ia64/vmx/vlsapic.c       Sat Jun 03 15:21:07 2006 -0600
@@ -39,6 +39,7 @@
 #include <asm/kregs.h>
 #include <asm/vmx_platform.h>
 #include <asm/hvm/vioapic.h>
+#include <asm/linux/jiffies.h>
 
 //u64  fire_itc;
 //u64  fire_itc2;
@@ -171,6 +172,8 @@ void vtm_set_itm(VCPU *vcpu, uint64_t va
     clear_bit(ITV_VECTOR(vitv), &VCPU(vcpu, irr[0]));
     VCPU(vcpu,itm)=val;
     cur_itc =now_itc(vtm);
+    if(time_before(val, cur_itc))
+        val = cur_itc;
     if(val >  vtm->last_itc){
         expires = NOW() + cycle_to_ns(val-cur_itc) + TIMER_SLOP;
         set_timer(&vtm->vtm_timer, expires);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog