ia64/xen-unstable

changeset 6462:af3750d1ec53

Bug fixes from Kevin (x2) and Anthony
Missing prototypes (Kevin)
Bad n_rid_blocks computation (Anthony)
Bad pte when single-entry dtlb lookup is successful (Kevin)
author djm@kirby.fc.hp.com
date Fri Sep 02 11:59:08 2005 -0600 (2005-09-02)
parents 68d8a0a1aeb7
children 21ad2828dbdf
files xen/arch/ia64/xen/regionreg.c xen/arch/ia64/xen/vcpu.c xen/include/asm-ia64/mm.h
line diff
     1.1 --- a/xen/arch/ia64/xen/regionreg.c	Thu Sep 01 15:51:57 2005 -0600
     1.2 +++ b/xen/arch/ia64/xen/regionreg.c	Fri Sep 02 11:59:08 2005 -0600
     1.3 @@ -116,7 +116,7 @@ int allocate_rid_range(struct domain *d,
     1.4  	ridbits = IA64_MIN_IMPL_RID_BITS;
     1.5  
     1.6  	// convert to rid_blocks and find one
     1.7 -	n_rid_blocks = ridbits - IA64_MIN_IMPL_RID_BITS + 1;
     1.8 +	n_rid_blocks = 1UL << (ridbits - IA64_MIN_IMPL_RID_BITS);
     1.9  	
    1.10  	// skip over block 0, reserved for "meta-physical mappings (and Xen)"
    1.11  	for (i = n_rid_blocks; i < MAX_RID_BLOCKS; i += n_rid_blocks) {
     2.1 --- a/xen/arch/ia64/xen/vcpu.c	Thu Sep 01 15:51:57 2005 -0600
     2.2 +++ b/xen/arch/ia64/xen/vcpu.c	Fri Sep 02 11:59:08 2005 -0600
     2.3 @@ -1315,7 +1315,8 @@ IA64FAULT vcpu_translate(VCPU *vcpu, UIN
     2.4  	/* check 1-entry TLB */
     2.5  	if ((trp = match_dtlb(vcpu,address))) {
     2.6  		dtlb_translate_count++;
     2.7 -		*pteval = trp->page_flags;
     2.8 +		//*pteval = trp->page_flags;
     2.9 +		*pteval = trp->arch.dtlb_pte;
    2.10  		*itir = trp->itir;
    2.11  		return IA64_NO_FAULT;
    2.12  	}
     3.1 --- a/xen/include/asm-ia64/mm.h	Thu Sep 01 15:51:57 2005 -0600
     3.2 +++ b/xen/include/asm-ia64/mm.h	Fri Sep 02 11:59:08 2005 -0600
     3.3 @@ -212,6 +212,12 @@ void memguard_unguard_range(void *p, uns
     3.4  #define memguard_unguard_range(_p,_l)  ((void)0)
     3.5  #endif
     3.6  
     3.7 +// prototype of misc memory stuff
     3.8 +unsigned long __get_free_pages(unsigned int mask, unsigned int order);
     3.9 +void __free_pages(struct page *page, unsigned int order);
    3.10 +void *pgtable_quicklist_alloc(void);
    3.11 +void pgtable_quicklist_free(void *pgtable_entry);
    3.12 +
    3.13  // FOLLOWING FROM linux-2.6.7/include/mm.h
    3.14  
    3.15  /*