ia64/xen-unstable

changeset 4185:105bb57fc414

bitkeeper revision 1.1250 (42388967abs8cSqOtVzsPvhEiltK5Q)

fixed manual merge error

Signed-off-by: michael.fetterman@cl.cam.ac.uk
author rneugeba@wyvis.research.intel-research.net
date Wed Mar 16 19:30:47 2005 +0000 (2005-03-16)
parents 8f0c441d9e25
children 688480d39d96
files xen/include/asm-x86/mm.h xen/include/xen/perfc_defn.h
line diff
     1.1 --- a/xen/include/asm-x86/mm.h	Wed Mar 16 17:56:21 2005 +0000
     1.2 +++ b/xen/include/asm-x86/mm.h	Wed Mar 16 19:30:47 2005 +0000
     1.3 @@ -129,8 +129,6 @@ static inline u32 pickle_domptr(struct d
     1.4  #define page_get_owner(_p)    (unpickle_domptr((_p)->u.inuse._domain))
     1.5  #define page_set_owner(_p,_d) ((_p)->u.inuse._domain = pickle_domptr(_d))
     1.6  
     1.7 -#define page_out_of_sync(_p)  ((_p)->count_info & PGC_out_of_sync)
     1.8 -
     1.9  #define SHARE_PFN_WITH_DOMAIN(_pfn, _dom)                                   \
    1.10      do {                                                                    \
    1.11          page_set_owner((_pfn), (_dom));                                     \
    1.12 @@ -235,22 +233,6 @@ static inline int get_page_and_type(stru
    1.13      return rc;
    1.14  }
    1.15  
    1.16 -static inline int mfn_is_page_table(unsigned long mfn)
    1.17 -{
    1.18 -    if ( !pfn_is_ram(mfn) )
    1.19 -        return 0;
    1.20 -
    1.21 -    return frame_table[mfn].count_info & PGC_page_table;
    1.22 -}
    1.23 -
    1.24 -static inline int page_is_page_table(struct pfn_info *page)
    1.25 -{
    1.26 -    if ( !pfn_is_ram(page_to_pfn(page)) )
    1.27 -        return 0;
    1.28 -
    1.29 -    return page->count_info & PGC_page_table;
    1.30 -}
    1.31 -
    1.32  #define ASSERT_PAGE_IS_TYPE(_p, _t)                            \
    1.33      ASSERT(((_p)->u.inuse.type_info & PGT_type_mask) == (_t)); \
    1.34      ASSERT(((_p)->u.inuse.type_info & PGT_count_mask) != 0)
     2.1 --- a/xen/include/xen/perfc_defn.h	Wed Mar 16 17:56:21 2005 +0000
     2.2 +++ b/xen/include/xen/perfc_defn.h	Wed Mar 16 19:30:47 2005 +0000
     2.3 @@ -83,3 +83,4 @@ PERFCOUNTER_CPU(validate_pte_calls,     
     2.4  PERFCOUNTER_CPU(validate_pte_changes,              "validate_pte makes changes")
     2.5  PERFCOUNTER_CPU(validate_pde_calls,                "calls to validate_pde_change")
     2.6  PERFCOUNTER_CPU(validate_pde_changes,              "validate_pde makes changes")
     2.7 +PERFCOUNTER_CPU(shadow_get_page_fail,   "shadow_get_page_from_l1e fails" )