[Xen-changelog] Bug fixes from Kevin (x2) and Anthony

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID af3750d1ec5376eb50783f155947db43189fe642
# Parent  68d8a0a1aeb7240b27e0e2ecea4c39d0e47fcb31
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)

diff -r 68d8a0a1aeb7 -r af3750d1ec53 xen/arch/ia64/xen/regionreg.c
--- a/xen/arch/ia64/xen/regionreg.c     Thu Sep  1 21:51:57 2005
+++ b/xen/arch/ia64/xen/regionreg.c     Fri Sep  2 17:59:08 2005
@@ -116,7 +116,7 @@
        ridbits = IA64_MIN_IMPL_RID_BITS;
 
        // convert to rid_blocks and find one
-       n_rid_blocks = ridbits - IA64_MIN_IMPL_RID_BITS + 1;
+       n_rid_blocks = 1UL << (ridbits - IA64_MIN_IMPL_RID_BITS);
        
        // skip over block 0, reserved for "meta-physical mappings (and Xen)"
        for (i = n_rid_blocks; i < MAX_RID_BLOCKS; i += n_rid_blocks) {
diff -r 68d8a0a1aeb7 -r af3750d1ec53 xen/arch/ia64/xen/vcpu.c
--- a/xen/arch/ia64/xen/vcpu.c  Thu Sep  1 21:51:57 2005
+++ b/xen/arch/ia64/xen/vcpu.c  Fri Sep  2 17:59:08 2005
@@ -1315,7 +1315,8 @@
        /* check 1-entry TLB */
        if ((trp = match_dtlb(vcpu,address))) {
                dtlb_translate_count++;
-               *pteval = trp->page_flags;
+               //*pteval = trp->page_flags;
+               *pteval = trp->arch.dtlb_pte;
                *itir = trp->itir;
                return IA64_NO_FAULT;
        }
diff -r 68d8a0a1aeb7 -r af3750d1ec53 xen/include/asm-ia64/mm.h
--- a/xen/include/asm-ia64/mm.h Thu Sep  1 21:51:57 2005
+++ b/xen/include/asm-ia64/mm.h Fri Sep  2 17:59:08 2005
@@ -212,6 +212,12 @@
 #define memguard_unguard_range(_p,_l)  ((void)0)
 #endif
 
+// prototype of misc memory stuff
+unsigned long __get_free_pages(unsigned int mask, unsigned int order);
+void __free_pages(struct page *page, unsigned int order);
+void *pgtable_quicklist_alloc(void);
+void pgtable_quicklist_free(void *pgtable_entry);
+
 // FOLLOWING FROM linux-2.6.7/include/mm.h
 
 /*

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog