ia64/xen-unstable

changeset 3940:6a7bbb8b60f4

bitkeeper revision 1.1236.1.30 (42204c4csSlUlMNeJeX9_Mcy3_XPYA)

Merge http://xen-ia64.bkbits.net/xeno-unstable-ia64.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno-unstable-ia64.bk
author kaf24@scramble.cl.cam.ac.uk
date Sat Feb 26 10:15:40 2005 +0000 (2005-02-26)
parents d8cf61e99a52 fbb1d8be1f5f
children 99fd3686e9b3
files xen/arch/ia64/domain.c xen/arch/ia64/vcpu.c xen/arch/ia64/xensetup.c
line diff
     1.1 --- a/xen/arch/ia64/domain.c	Fri Feb 25 22:55:44 2005 +0000
     1.2 +++ b/xen/arch/ia64/domain.c	Sat Feb 26 10:15:40 2005 +0000
     1.3 @@ -470,8 +470,6 @@ void alloc_dom0(void)
     1.4  }
     1.5  
     1.6  int construct_dom0(struct domain *d, 
     1.7 -                   unsigned long alloc_start,
     1.8 -                   unsigned long alloc_end,
     1.9                     unsigned long image_start, unsigned long image_len, 
    1.10                     unsigned long initrd_start, unsigned long initrd_len,
    1.11                     char *cmdline)
     2.1 --- a/xen/arch/ia64/vcpu.c	Fri Feb 25 22:55:44 2005 +0000
     2.2 +++ b/xen/arch/ia64/vcpu.c	Sat Feb 26 10:15:40 2005 +0000
     2.3 @@ -1421,7 +1421,7 @@ extern struct domain *dom0;
     2.4  void vcpu_itc_no_srlz(VCPU *vcpu, UINT64 IorD, UINT64 vaddr, UINT64 pte, UINT64 logps)
     2.5  {
     2.6  	unsigned long psr;
     2.7 -	unsigned long ps = (vcpu==dom0) ? logps : PAGE_SHIFT;
     2.8 +	unsigned long ps = (vcpu->domain==dom0) ? logps : PAGE_SHIFT;
     2.9  
    2.10  	// FIXME: validate ifa here (not in Xen space), COULD MACHINE CHECK!
    2.11  	// FIXME, must be inlined or potential for nested fault here!
     3.1 --- a/xen/arch/ia64/xensetup.c	Fri Feb 25 22:55:44 2005 +0000
     3.2 +++ b/xen/arch/ia64/xensetup.c	Sat Feb 26 10:15:40 2005 +0000
     3.3 @@ -341,8 +341,6 @@ printk("About to  process command line\n
     3.4  #ifdef IA64
     3.5  printk("About to call construct_dom0()\n");
     3.6      if ( construct_dom0(dom0, dom0_memory_start, dom0_memory_end,
     3.7 -                        0, 
     3.8 -                        0,
     3.9  			0,
    3.10                          0,
    3.11  			0) != 0)
    3.12 @@ -366,8 +364,6 @@ printk("CONSTRUCTING DOMAIN0 CLONE #%d\n
    3.13          if ( construct_dom0(clones[i], dom0_memory_start, dom0_memory_end,
    3.14                          0, 
    3.15                          0,
    3.16 -			0,
    3.17 -                        0,
    3.18  			0) != 0)
    3.19              panic("Could not set up DOM0 clone %d\n",i);
    3.20      }