ia64/xen-unstable

changeset 3104:ef30f8537436

bitkeeper revision 1.1159.189.5 (41a4df43-1oRwflRup-Lv0_uV9XxdQ)

sync w/ head.
author cl349@arcadians.cl.cam.ac.uk
date Wed Nov 24 19:21:39 2004 +0000 (2004-11-24)
parents 2fae9947de6f
children f7a9de9a462f
files xen/arch/x86/x86_32/entry.S xen/common/dom_mem_ops.c
line diff
     1.1 --- a/xen/arch/x86/x86_32/entry.S	Wed Nov 24 18:33:23 2004 +0000
     1.2 +++ b/xen/arch/x86/x86_32/entry.S	Wed Nov 24 19:21:39 2004 +0000
     1.3 @@ -96,7 +96,7 @@ do_multicall:
     1.4  multicall_loop:
     1.5          pushl %ecx
     1.6          movl  4(%esp),%ecx               # %ecx = struct domain
     1.7 -        movl  DOMAIN_processor(%ecx),%eax
     1.8 +        movl  EDOMAIN_processor(%ecx),%eax
     1.9          shl   $6,%eax                    # sizeof(irq_cpustat) == 64
    1.10          testl $~0,SYMBOL_NAME(irq_stat)(%eax,1)
    1.11          jnz   multicall_preempt
     2.1 --- a/xen/common/dom_mem_ops.c	Wed Nov 24 18:33:23 2004 +0000
     2.2 +++ b/xen/common/dom_mem_ops.c	Wed Nov 24 19:21:39 2004 +0000
     2.3 @@ -39,7 +39,7 @@ static long alloc_dom_mem(struct domain 
     2.4              __HYPERVISOR_dom_mem_op, 5,
     2.5              MEMOP_increase_reservation,
     2.6              &extent_list[i], nr_extents-i, extent_order,
     2.7 -            (d == current) ? DOMID_SELF : d->id);
     2.8 +            (d == current->domain) ? DOMID_SELF : d->id);
     2.9  
    2.10          if ( unlikely((page = alloc_domheap_pages(d, extent_order)) == NULL) )
    2.11          {
    2.12 @@ -73,7 +73,7 @@ static long free_dom_mem(struct domain *
    2.13              __HYPERVISOR_dom_mem_op, 5,
    2.14              MEMOP_decrease_reservation,
    2.15              &extent_list[i], nr_extents-i, extent_order,
    2.16 -            (d == current) ? DOMID_SELF : d->id);
    2.17 +            (d == current->domain) ? DOMID_SELF : d->id);
    2.18  
    2.19          if ( unlikely(__get_user(mpfn, &extent_list[i]) != 0) )
    2.20              return i;