ia64/xen-unstable

changeset 3818:64c43cfd7068

bitkeeper revision 1.1159.261.4 (420e3f0ctRGZge_a33H-GsBosW224g)

Cleanup after merge
author mafetter@fleming.research
date Sat Feb 12 17:38:20 2005 +0000 (2005-02-12)
parents 2e88f4d9217f
children 5fe5f4c3da20
files xen/arch/x86/mm.c
line diff
     1.1 --- a/xen/arch/x86/mm.c	Sat Feb 12 17:26:12 2005 +0000
     1.2 +++ b/xen/arch/x86/mm.c	Sat Feb 12 17:38:20 2005 +0000
     1.3 @@ -1598,17 +1598,17 @@ int do_update_va_mapping(unsigned long v
     1.4               * page was not shadowed, or that the L2 entry has not yet been
     1.5               * updated to reflect the shadow.
     1.6               */
     1.7 -            unsigned l2_idx = page_nr >> (L2_PAGETABLE_SHIFT - L1_PAGETABLE_SHIFT);
     1.8 -            l2_pgentry_t gpde = linear_l2_table[l2_idx];
     1.9 +            l2_pgentry_t gpde = linear_l2_table[l2_table_offset(va)];
    1.10              unsigned long gpfn = l2_pgentry_val(gpde) >> PAGE_SHIFT;
    1.11  
    1.12 -            if (get_shadow_status(&d->mm, gpfn))
    1.13 +            if (get_shadow_status(d, gpfn))
    1.14              {
    1.15 -                unsigned long *gl1e = map_domain_mem(gpfn << PAGE_SHIFT);
    1.16 -                unsigned l1_idx = page_nr & (ENTRIES_PER_L1_PAGETABLE - 1);
    1.17 +                unsigned long gmfn = __gpfn_to_mfn(d, gpfn);
    1.18 +                unsigned long *gl1e = map_domain_mem(gmfn << PAGE_SHIFT);
    1.19 +                unsigned l1_idx = l1_table_offset(va);
    1.20                  gl1e[l1_idx] = sval;
    1.21                  unmap_domain_mem(gl1e);
    1.22 -                put_shadow_status(&d->mm);
    1.23 +                put_shadow_status(d);
    1.24  
    1.25                  perfc_incrc(shadow_update_va_fail1);
    1.26              }