ia64/xen-unstable

changeset 3668:4f291c00af8c

bitkeeper revision 1.1159.212.96 (4204aff5pQipffND8_37kyj01pfiWQ)

Hand merge changes to schedule.c

Signed-off-by: michael.fetterman@cl.cam.ac.uk
author mafetter@fleming.research
date Sat Feb 05 11:37:25 2005 +0000 (2005-02-05)
parents 4294cfa9fad3 c4a7f635b2cd
children e8ee717f2423
files xen/common/schedule.c
line diff
     1.1 --- a/xen/common/schedule.c	Sat Feb 05 11:12:14 2005 +0000
     1.2 +++ b/xen/common/schedule.c	Sat Feb 05 11:37:25 2005 +0000
     1.3 @@ -373,13 +373,6 @@ void __enter_scheduler(void)
     1.4      task_slice_t        next_slice;
     1.5      s32                 r_time;     /* time for new dom to run */
     1.6  
     1.7 -    if ( !is_idle_task(current->domain) )
     1.8 -    {
     1.9 -        LOCK_BIGLOCK(current->domain);
    1.10 -        cleanup_writable_pagetable(prev->domain);
    1.11 -        UNLOCK_BIGLOCK(current->domain);
    1.12 -    }
    1.13 -
    1.14      perfc_incrc(sched_run);
    1.15      
    1.16      spin_lock_irq(&schedule_data[cpu].schedule_lock);
    1.17 @@ -429,6 +422,13 @@ void __enter_scheduler(void)
    1.18      
    1.19      perfc_incrc(sched_ctx);
    1.20  
    1.21 +    if ( !is_idle_task(current->domain) )
    1.22 +    {
    1.23 +        LOCK_BIGLOCK(current->domain);
    1.24 +        cleanup_writable_pagetable(prev->domain);
    1.25 +        UNLOCK_BIGLOCK(current->domain);
    1.26 +    }
    1.27 +
    1.28  #if defined(WAKE_HISTO)
    1.29      if ( !is_idle_task(next) && next->wokenup ) {
    1.30          ulong diff = (ulong)(now - next->wokenup);