[Xen-changelog] fixed manual merge error

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1250, 2005/03/16 19:30:47+00:00, 
rneugeba@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

        fixed manual merge error
        
        Signed-off-by: michael.fetterman@xxxxxxxxxxxx



 asm-x86/mm.h     |   18 ------------------
 xen/perfc_defn.h |    1 +
 2 files changed, 1 insertion(+), 18 deletions(-)


diff -Nru a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h
--- a/xen/include/asm-x86/mm.h  2005-04-05 12:12:14 -04:00
+++ b/xen/include/asm-x86/mm.h  2005-04-05 12:12:14 -04:00
@@ -129,8 +129,6 @@
 #define page_get_owner(_p)    (unpickle_domptr((_p)->u.inuse._domain))
 #define page_set_owner(_p,_d) ((_p)->u.inuse._domain = pickle_domptr(_d))
 
-#define page_out_of_sync(_p)  ((_p)->count_info & PGC_out_of_sync)
-
 #define SHARE_PFN_WITH_DOMAIN(_pfn, _dom)                                   \
     do {                                                                    \
         page_set_owner((_pfn), (_dom));                                     \
@@ -233,22 +231,6 @@
     }
 
     return rc;
-}
-
-static inline int mfn_is_page_table(unsigned long mfn)
-{
-    if ( !pfn_is_ram(mfn) )
-        return 0;
-
-    return frame_table[mfn].count_info & PGC_page_table;
-}
-
-static inline int page_is_page_table(struct pfn_info *page)
-{
-    if ( !pfn_is_ram(page_to_pfn(page)) )
-        return 0;
-
-    return page->count_info & PGC_page_table;
 }
 
 #define ASSERT_PAGE_IS_TYPE(_p, _t)                            \
diff -Nru a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h
--- a/xen/include/xen/perfc_defn.h      2005-04-05 12:12:14 -04:00
+++ b/xen/include/xen/perfc_defn.h      2005-04-05 12:12:14 -04:00
@@ -83,3 +83,4 @@
 PERFCOUNTER_CPU(validate_pte_changes,              "validate_pte makes 
changes")
 PERFCOUNTER_CPU(validate_pde_calls,                "calls to 
validate_pde_change")
 PERFCOUNTER_CPU(validate_pde_changes,              "validate_pde makes 
changes")
+PERFCOUNTER_CPU(shadow_get_page_fail,   "shadow_get_page_from_l1e fails" )

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