direct-io.hg

changeset 13342:95a0b456255a

[XEN] Replace mfn_to_page(lXe_get_pfn()) by lXe_get_page().
Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kfraser@localhost.localdomain
date Fri Jan 12 10:10:28 2007 +0000 (2007-01-12)
parents 162d9d9eaf4a
children ded167dc4dc9
files xen/arch/x86/mm.c
line diff
     1.1 --- a/xen/arch/x86/mm.c	Fri Jan 12 10:08:38 2007 +0000
     1.2 +++ b/xen/arch/x86/mm.c	Fri Jan 12 10:10:28 2007 +0000
     1.3 @@ -826,7 +826,7 @@ static void put_page_from_l2e(l2_pgentry
     1.4  {
     1.5      if ( (l2e_get_flags(l2e) & _PAGE_PRESENT) && 
     1.6           (l2e_get_pfn(l2e) != pfn) )
     1.7 -        put_page_and_type(mfn_to_page(l2e_get_pfn(l2e)));
     1.8 +        put_page_and_type(l2e_get_page(l2e));
     1.9  }
    1.10  
    1.11  
    1.12 @@ -835,7 +835,7 @@ static void put_page_from_l3e(l3_pgentry
    1.13  {
    1.14      if ( (l3e_get_flags(l3e) & _PAGE_PRESENT) && 
    1.15           (l3e_get_pfn(l3e) != pfn) )
    1.16 -        put_page_and_type(mfn_to_page(l3e_get_pfn(l3e)));
    1.17 +        put_page_and_type(l3e_get_page(l3e));
    1.18  }
    1.19  #endif
    1.20  
    1.21 @@ -844,7 +844,7 @@ static void put_page_from_l4e(l4_pgentry
    1.22  {
    1.23      if ( (l4e_get_flags(l4e) & _PAGE_PRESENT) && 
    1.24           (l4e_get_pfn(l4e) != pfn) )
    1.25 -        put_page_and_type(mfn_to_page(l4e_get_pfn(l4e)));
    1.26 +        put_page_and_type(l4e_get_page(l4e));
    1.27  }
    1.28  #endif
    1.29  
    1.30 @@ -3354,7 +3354,6 @@ int ptwr_do_page_fault(struct vcpu *v, u
    1.31                         struct cpu_user_regs *regs)
    1.32  {
    1.33      struct domain *d = v->domain;
    1.34 -    unsigned long     pfn;
    1.35      struct page_info *page;
    1.36      l1_pgentry_t      pte;
    1.37      struct ptwr_emulate_ctxt ptwr_ctxt;
    1.38 @@ -3368,8 +3367,7 @@ int ptwr_do_page_fault(struct vcpu *v, u
    1.39      guest_get_eff_l1e(v, addr, &pte);
    1.40      if ( !(l1e_get_flags(pte) & _PAGE_PRESENT) )
    1.41          goto bail;
    1.42 -    pfn  = l1e_get_pfn(pte);
    1.43 -    page = mfn_to_page(pfn);
    1.44 +    page = l1e_get_page(pte);
    1.45  
    1.46      /* We are looking only for read-only mappings of p.t. pages. */
    1.47      if ( ((l1e_get_flags(pte) & (_PAGE_PRESENT|_PAGE_RW)) != _PAGE_PRESENT) ||