ia64/xen-unstable

changeset 5937:10872902be39

Accomodate change to common alloc_domheap_page
author djm@kirby.fc.hp.com
date Fri Jul 29 13:33:04 2005 -0700 (2005-07-29)
parents b53a65034532
children 36ac9bc7dd15
files xen/arch/ia64/vmmu.c xen/arch/ia64/vtlb.c xen/arch/ia64/xenmem.c
line diff
     1.1 --- a/xen/arch/ia64/vmmu.c	Fri Jul 29 13:25:03 2005 -0700
     1.2 +++ b/xen/arch/ia64/vmmu.c	Fri Jul 29 13:33:04 2005 -0700
     1.3 @@ -145,7 +145,7 @@ static thash_cb_t *init_domain_vhpt(stru
     1.4      thash_cb_t  *vhpt;
     1.5      PTA pta_value;
     1.6      
     1.7 -    page = alloc_domheap_pages (NULL, VCPU_TLB_ORDER);
     1.8 +    page = alloc_domheap_pages (NULL, VCPU_TLB_ORDER, 0);
     1.9      if ( page == NULL ) {
    1.10          panic("No enough contiguous memory for init_domain_mm\n");
    1.11      }
    1.12 @@ -187,7 +187,7 @@ thash_cb_t *init_domain_tlb(struct vcpu 
    1.13      tlb_special_t  *ts;
    1.14      thash_cb_t  *tlb;
    1.15      
    1.16 -    page = alloc_domheap_pages (NULL, VCPU_TLB_ORDER);
    1.17 +    page = alloc_domheap_pages (NULL, VCPU_TLB_ORDER, 0);
    1.18      if ( page == NULL ) {
    1.19          panic("No enough contiguous memory for init_domain_mm\n");
    1.20      }
    1.21 @@ -224,7 +224,7 @@ alloc_pmt(struct domain *d)
    1.22      /* Only called once */
    1.23      ASSERT(d->arch.pmt);
    1.24  
    1.25 -    page = alloc_domheap_pages(NULL, get_order(d->max_pages));
    1.26 +    page = alloc_domheap_pages(NULL, get_order(d->max_pages), 0);
    1.27      ASSERT(page);
    1.28  
    1.29      d->arch.pmt = page_to_virt(page);
     2.1 --- a/xen/arch/ia64/vtlb.c	Fri Jul 29 13:25:03 2005 -0700
     2.2 +++ b/xen/arch/ia64/vtlb.c	Fri Jul 29 13:33:04 2005 -0700
     2.3 @@ -939,7 +939,7 @@ void check_vtlb_sanity(thash_cb_t *vtlb)
     2.4      if ( sanity_check == 0 ) return;
     2.5      sanity_check --;
     2.6      s_sect.v = 0;
     2.7 -//    page = alloc_domheap_pages (NULL, VCPU_TLB_ORDER);
     2.8 +//    page = alloc_domheap_pages (NULL, VCPU_TLB_ORDER, 0);
     2.9  //    if ( page == NULL ) {
    2.10  //        panic("No enough contiguous memory for init_domain_mm\n");
    2.11  //    };
     3.1 --- a/xen/arch/ia64/xenmem.c	Fri Jul 29 13:25:03 2005 -0700
     3.2 +++ b/xen/arch/ia64/xenmem.c	Fri Jul 29 13:33:04 2005 -0700
     3.3 @@ -65,7 +65,7 @@ paging_init (void)
     3.4  #else // CONFIG_VTI
     3.5  
     3.6  	/* Allocate and map the machine-to-phys table */
     3.7 -	if ((pg = alloc_domheap_pages(NULL, 10)) == NULL)
     3.8 +	if ((pg = alloc_domheap_pages(NULL, 10, 0)) == NULL)
     3.9  		panic("Not enough memory to bootstrap Xen.\n");
    3.10  	memset(page_to_virt(pg), 0x55, 16UL << 20);
    3.11  #endif // CONFIG_VTI