ia64/xen-unstable

changeset 3533:c6f1bab39d4f

bitkeeper revision 1.1159.212.39 (41f654d8oXg3D1jTyrHKYjWTMVzAew)

manual merge.
author kaf24@scramble.cl.cam.ac.uk
date Tue Jan 25 14:16:56 2005 +0000 (2005-01-25)
parents 51052c8b6456
children 8b969ff555c1
files xen/common/physdev.c xen/common/sched_bvt.c
line diff
     1.1 --- a/xen/common/physdev.c	Tue Jan 25 14:11:06 2005 +0000
     1.2 +++ b/xen/common/physdev.c	Tue Jan 25 14:16:56 2005 +0000
     1.3 @@ -635,7 +635,7 @@ static long pci_probe_root_buses(u32 *bu
     1.4  
     1.5      memset(busmask, 0, 256/8);
     1.6  
     1.7 -    list_for_each_entry ( pdev, &current->pcidev_list, node )
     1.8 +    list_for_each_entry ( pdev, &current->domain->pcidev_list, node )
     1.9          set_bit(pdev->dev->bus->number, busmask);
    1.10  
    1.11      return 0;
     2.1 --- a/xen/common/sched_bvt.c	Tue Jan 25 14:11:06 2005 +0000
     2.2 +++ b/xen/common/sched_bvt.c	Tue Jan 25 14:16:56 2005 +0000
     2.3 @@ -370,7 +370,6 @@ static task_slice_t bvt_do_schedule(s_ti
     2.4  {
     2.5      struct domain *d;
     2.6      struct exec_domain      *prev = current, *next = NULL, *next_prime, *ed; 
     2.7 -    struct list_head   *tmp;
     2.8      int                 cpu = prev->processor;
     2.9      s32                 r_time;     /* time for new dom to run */
    2.10      u32                 next_evt, next_prime_evt, min_avt;
    2.11 @@ -415,10 +414,8 @@ static task_slice_t bvt_do_schedule(s_ti
    2.12      next_prime_evt = ~0U;
    2.13      min_avt        = ~0U;
    2.14  
    2.15 -    list_for_each ( tmp, RUNQUEUE(cpu) )
    2.16 +    list_for_each_entry ( p_einf, RUNQUEUE(cpu), run_list )
    2.17      {
    2.18 -        p_einf = list_entry(tmp, struct bvt_edom_info, run_list);
    2.19 -
    2.20          if ( p_einf->evt < next_evt )
    2.21          {
    2.22              next_prime_einf  = next_einf;
    2.23 @@ -530,7 +527,7 @@ static void bvt_dump_settings(void)
    2.24  
    2.25  static void bvt_dump_cpu_state(int i)
    2.26  {
    2.27 -    struct list_head *list, *queue;
    2.28 +    struct list_head *queue;
    2.29      int loop = 0;
    2.30      struct bvt_edom_info *d_inf;
    2.31      struct exec_domain *d;
    2.32 @@ -541,17 +538,15 @@ static void bvt_dump_cpu_state(int i)
    2.33      printk("QUEUE rq %lx   n: %lx, p: %lx\n",  (unsigned long)queue,
    2.34             (unsigned long) queue->next, (unsigned long) queue->prev);
    2.35  
    2.36 -    list_for_each ( list, queue )
    2.37 +    list_for_each_entry ( d_inf, queue, run_list )
    2.38      {
    2.39 -        d_inf = list_entry(list, struct bvt_edom_info, run_list);
    2.40          d = d_inf->exec_domain;
    2.41          printk("%3d: %u has=%c ", loop++, d->domain->id,
    2.42                 test_bit(EDF_RUNNING, &d->ed_flags) ? 'T':'F');
    2.43          bvt_dump_runq_el(d);
    2.44          printk("c=0x%X%08X\n", (u32)(d->cpu_time>>32), (u32)d->cpu_time);
    2.45 -        printk("         l: %lx n: %lx  p: %lx\n",
    2.46 -               (unsigned long)list, (unsigned long)list->next,
    2.47 -               (unsigned long)list->prev);
    2.48 +        printk("         l: %p n: %p  p: %p\n",
    2.49 +               &d_inf->run_list, d_inf->run_list.next, d_inf->run_list.prev);
    2.50      }
    2.51  }
    2.52