# HG changeset patch
# User mafetter@fleming.research
# Date 1107603445 0
# Node ID 4f291c00af8c41b7e75221e36a239c1ca1369711
# Parent  4294cfa9fad329570c1a13a791d735d62014b081# Parent  c4a7f635b2cdc8c21bc9c6218153e848489cb3df
bitkeeper revision 1.1159.212.96 (4204aff5pQipffND8_37kyj01pfiWQ)

Hand merge changes to schedule.c
  
Signed-off-by: michael.fetterman@cl.cam.ac.uk


diff -r 4294cfa9fad3 -r 4f291c00af8c xen/common/schedule.c
--- a/xen/common/schedule.c	Sat Feb 05 11:12:14 2005 +0000
+++ b/xen/common/schedule.c	Sat Feb 05 11:37:25 2005 +0000
@@ -373,13 +373,6 @@ void __enter_scheduler(void)
     task_slice_t        next_slice;
     s32                 r_time;     /* time for new dom to run */
 
-    if ( !is_idle_task(current->domain) )
-    {
-        LOCK_BIGLOCK(current->domain);
-        cleanup_writable_pagetable(prev->domain);
-        UNLOCK_BIGLOCK(current->domain);
-    }
-
     perfc_incrc(sched_run);
     
     spin_lock_irq(&schedule_data[cpu].schedule_lock);
@@ -429,6 +422,13 @@ void __enter_scheduler(void)
     
     perfc_incrc(sched_ctx);
 
+    if ( !is_idle_task(current->domain) )
+    {
+        LOCK_BIGLOCK(current->domain);
+        cleanup_writable_pagetable(prev->domain);
+        UNLOCK_BIGLOCK(current->domain);
+    }
+
 #if defined(WAKE_HISTO)
     if ( !is_idle_task(next) && next->wokenup ) {
         ulong diff = (ulong)(now - next->wokenup);