[Xen-changelog] cleanup after merge

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1289, 2005/04/12 11:16:00+01:00, mafetter@xxxxxxxxxxxxxxxx

        cleanup after merge



 linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 |    1 
 linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 |    2 -
 xen/include/asm-x86/shadow.h                                   |   11 
----------
 3 files changed, 3 insertions(+), 11 deletions(-)


diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 
b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32
--- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32    
2005-04-13 19:03:21 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32    
2005-04-13 19:03:21 -04:00
@@ -20,6 +20,7 @@
 CONFIG_XEN_NETDEV_FRONTEND=y
 # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
 # CONFIG_XEN_BLKDEV_TAP is not set
+# CONFIG_XEN_SHADOW_MODE is not set
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_X86=y
 # CONFIG_XEN_X86_64 is not set
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 
b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
--- a/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32    
2005-04-13 19:03:21 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32    
2005-04-13 19:03:21 -04:00
@@ -17,7 +17,7 @@
 CONFIG_XEN_NETDEV_FRONTEND=y
 # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
 # CONFIG_XEN_BLKDEV_TAP is not set
-CONFIG_XEN_SHADOW_MODE=y
+# CONFIG_XEN_SHADOW_MODE is not set
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_X86=y
 # CONFIG_XEN_X86_64 is not set
diff -Nru a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h
--- a/xen/include/asm-x86/shadow.h      2005-04-13 19:03:21 -04:00
+++ b/xen/include/asm-x86/shadow.h      2005-04-13 19:03:21 -04:00
@@ -398,28 +398,19 @@
            page->count_info, page->u.inuse.type_info);
 }
 
+/* XXX Needs more thought. Neither pretty nor fast: a place holder. */
 static inline void shadow_sync_and_drop_references(
     struct domain *d, struct pfn_info *page)
 {
     if ( likely(!shadow_mode_enabled(d)) )
         return;
 
-    /* XXX Needs more thought. Neither pretty nor fast: a place holder. */
     shadow_lock(d);
 
     if ( page_out_of_sync(page) )
         __shadow_sync_mfn(d, page_to_pfn(page));
 
     shadow_remove_all_access(d, page_to_pfn(page));
-
-    if ( page->count_info != 1 )
-    {
-        printk("free_dom_mem in shadow mode didn't release page "
-               "mfn=%p c=%p\n", page_to_pfn(page), page->count_info);
-        shadow_unlock(d);
-        audit_domain(d);
-        BUG();
-    }
 
     shadow_unlock(d);
 }

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