bitkeeper revision 1.1236.25.7 (42330132deNMlShMHnhiB6lqTUcESQ)

Fix VMX guest scheduling.
Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com>
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index 71cc7e15812c531468ddf2e0c68f14812ad8e4dd..cfb60bfcb5c00809b6dbcd8430b1f39b13013246 100644 (file)
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -765,7 +765,7 @@ void context_switch(struct exec_domain *prev_p, struct exec_domain *next_p)
             __asm__ __volatile__ ("lgdt %0" : "=m" (*next_p->arch.gdt));
 
             __sti();
-            return;
+            goto done;
         }
 #endif
  
@@ -810,6 +810,7 @@ void context_switch(struct exec_domain *prev_p, struct exec_domain *next_p)
 
     switch_segments(stack_ec, prev_p, next_p);
 
+ done:
     /*
      * We do this late on because it doesn't need to be protected by the
      * schedule_lock, and because we want this to be the very last use of