1.1 --- a/xen/arch/ia64/vmx/vmmu.c	Tue Mar 27 12:21:48 2007 -0600
     1.2 +++ b/xen/arch/ia64/vmx/vmmu.c	Fri Mar 30 10:21:17 2007 -0600
     1.3 @@ -212,7 +212,7 @@ void free_domain_tlb(struct vcpu *v)
     1.4   * Insert guest TLB to machine TLB.
     1.5   *  data:   In TLB format
     1.6   */
     1.7 -void machine_tlb_insert(struct vcpu *d, thash_data_t *tlb)
     1.8 +void machine_tlb_insert(struct vcpu *v, thash_data_t *tlb)
     1.9  {
    1.10      u64     psr;
    1.11      thash_data_t    mtlb;
    1.12 @@ -221,12 +221,12 @@ void machine_tlb_insert(struct vcpu *d, 
    1.13      mtlb.ifa = tlb->vadr;
    1.14      mtlb.itir = tlb->itir & ~ITIR_RV_MASK;
    1.15      mtlb.page_flags = tlb->page_flags & ~PAGE_FLAGS_RV_MASK;
    1.16 -    mtlb.ppn = get_mfn(d->domain,tlb->ppn);
    1.17 +    mtlb.ppn = get_mfn(v->domain, tlb->ppn);
    1.18      mtlb_ppn=mtlb.ppn;
    1.19  
    1.20  #if 0
    1.21      if (mtlb_ppn == INVALID_MFN)
    1.22 -        panic_domain(vcpu_regs(d),"Machine tlb insert with invalid mfn number.\n");
    1.23 +        panic_domain(vcpu_regs(v), "Machine tlb insert with invalid mfn number.\n");
    1.24  #endif
    1.25  
    1.26      psr = ia64_clear_ic();

     2.1 --- a/xen/include/asm-ia64/vmmu.h	Tue Mar 27 12:21:48 2007 -0600
     2.2 +++ b/xen/include/asm-ia64/vmmu.h	Fri Mar 30 10:21:17 2007 -0600
     2.3 @@ -295,9 +295,9 @@ extern int thash_lock_tc(thash_cb_t *hcb
     2.4  extern u64 machine_ttag(PTA pta, u64 va);
     2.5  extern u64 machine_thash(PTA pta, u64 va);
     2.6  extern void purge_machine_tc_by_domid(domid_t domid);
     2.7 -extern void machine_tlb_insert(struct vcpu *d, thash_data_t *tlb);
     2.8 +extern void machine_tlb_insert(struct vcpu *v, thash_data_t *tlb);
     2.9  extern ia64_rr vmmu_get_rr(struct vcpu *vcpu, u64 va);
    2.10 -extern int init_domain_tlb(struct vcpu *d);
    2.11 +extern int init_domain_tlb(struct vcpu *v);
    2.12  extern void free_domain_tlb(struct vcpu *v);
    2.13  extern thash_data_t * vsa_thash(PTA vpta, u64 va, u64 vrr, u64 *tag);
    2.14  extern thash_data_t * vhpt_lookup(u64 va);