1.1 --- a/xen/common/sched_bvt.c	Mon May 31 21:25:53 2004 +0000
     1.2 +++ b/xen/common/sched_bvt.c	Mon May 31 22:42:33 2004 +0000
     1.3 @@ -170,6 +170,7 @@ void bvt_wake_up(struct task_struct *p)
     1.4  static void bvt_do_block(struct task_struct *p)
     1.5  {
     1.6      BVT_INFO(p)->warpback = 0; 
     1.7 +	__del_from_runqueue(p);
     1.8  }
     1.9  
    1.10  /* Control the scheduler. */
    1.11 @@ -205,10 +206,10 @@ int bvt_adjdom(struct task_struct *p,
    1.12          
    1.13          struct bvt_dom_info *inf = BVT_INFO(p);
    1.14          
    1.15 -        DPRINTK("Get domain %lld bvt mcu_adv=%ld, warp=%ld, warpl=%ld,"
    1.16 -                " warpu=%ld\n",
    1.17 -                p->domain, inf->mcu_advance, inf->warp,
    1.18 -                inf->warpl, inf->warpu );
    1.19 +
    1.20 +		printk("Get domain %lld bvt mcu_adv=%ld, warp=%ld, warpl=%ld, warpu=%ld\n",
    1.21 +			   p->domain, inf->mcu_advance, inf->warp,
    1.22 +			   inf->warpl, inf->warpu );
    1.23  
    1.24          /* Sanity -- this can avoid divide-by-zero. */
    1.25          if ( mcu_adv == 0 )
    1.26 @@ -220,10 +221,9 @@ int bvt_adjdom(struct task_struct *p,
    1.27          inf->warpl = warpl;
    1.28          inf->warpu = warpu;
    1.29  
    1.30 -        DPRINTK("Set domain %lld bvt mcu_adv=%ld, warp=%ld, warpl=%ld,"
    1.31 -                " warpu=%ld\n",
    1.32 -                p->domain, inf->mcu_advance, inf->warp,
    1.33 -                inf->warpl, inf->warpu );
    1.34 +		printk("Set domain %lld bvt mcu_adv=%ld, warp=%ld, warpl=%ld, warpu=%ld\n",
    1.35 +			   p->domain, inf->mcu_advance, inf->warp,
    1.36 +			   inf->warpl, inf->warpu );
    1.37  
    1.38          spin_unlock_irqrestore(&schedule_lock[p->processor], flags);
    1.39      }
    1.40 @@ -277,7 +277,8 @@ static task_slice_t bvt_do_schedule(s_ti
    1.41          
    1.42          __calc_evt(prev_inf);
    1.43          
    1.44 -        __del_from_runqueue(prev);
    1.45 +        if( __task_on_runqueue(prev))
    1.46 +			__del_from_runqueue(prev);
    1.47          
    1.48          if ( likely(prev->state == TASK_RUNNING) )
    1.49              __add_to_runqueue_tail(prev);