direct-io.hg

changeset 4511:94452568bf73

bitkeeper revision 1.1289 (425b9fe0JVvbTzMQDh4T-vsRodcmaw)

cleanup after merge
author mafetter@fleming.research
date Tue Apr 12 10:16:00 2005 +0000 (2005-04-12)
parents f6326ed2e7fe
children 97a657e8eddb
files linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 xen/include/asm-x86/shadow.h
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32	Tue Apr 12 09:48:55 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32	Tue Apr 12 10:16:00 2005 +0000
     1.3 @@ -20,6 +20,7 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
     1.4  CONFIG_XEN_NETDEV_FRONTEND=y
     1.5  # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
     1.6  # CONFIG_XEN_BLKDEV_TAP is not set
     1.7 +# CONFIG_XEN_SHADOW_MODE is not set
     1.8  CONFIG_XEN_SCRUB_PAGES=y
     1.9  CONFIG_XEN_X86=y
    1.10  # CONFIG_XEN_X86_64 is not set
     2.1 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32	Tue Apr 12 09:48:55 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32	Tue Apr 12 10:16:00 2005 +0000
     2.3 @@ -17,7 +17,7 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
     2.4  CONFIG_XEN_NETDEV_FRONTEND=y
     2.5  # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
     2.6  # CONFIG_XEN_BLKDEV_TAP is not set
     2.7 -CONFIG_XEN_SHADOW_MODE=y
     2.8 +# CONFIG_XEN_SHADOW_MODE is not set
     2.9  CONFIG_XEN_SCRUB_PAGES=y
    2.10  CONFIG_XEN_X86=y
    2.11  # CONFIG_XEN_X86_64 is not set
     3.1 --- a/xen/include/asm-x86/shadow.h	Tue Apr 12 09:48:55 2005 +0000
     3.2 +++ b/xen/include/asm-x86/shadow.h	Tue Apr 12 10:16:00 2005 +0000
     3.3 @@ -398,13 +398,13 @@ static inline void shadow_drop_reference
     3.4             page->count_info, page->u.inuse.type_info);
     3.5  }
     3.6  
     3.7 +/* XXX Needs more thought. Neither pretty nor fast: a place holder. */
     3.8  static inline void shadow_sync_and_drop_references(
     3.9      struct domain *d, struct pfn_info *page)
    3.10  {
    3.11      if ( likely(!shadow_mode_enabled(d)) )
    3.12          return;
    3.13  
    3.14 -    /* XXX Needs more thought. Neither pretty nor fast: a place holder. */
    3.15      shadow_lock(d);
    3.16  
    3.17      if ( page_out_of_sync(page) )
    3.18 @@ -412,15 +412,6 @@ static inline void shadow_sync_and_drop_
    3.19  
    3.20      shadow_remove_all_access(d, page_to_pfn(page));
    3.21  
    3.22 -    if ( page->count_info != 1 )
    3.23 -    {
    3.24 -        printk("free_dom_mem in shadow mode didn't release page "
    3.25 -               "mfn=%p c=%p\n", page_to_pfn(page), page->count_info);
    3.26 -        shadow_unlock(d);
    3.27 -        audit_domain(d);
    3.28 -        BUG();
    3.29 -    }
    3.30 -
    3.31      shadow_unlock(d);
    3.32  }
    3.33