ia64/xen-unstable

changeset 7117:9e0b6fbab872

Merge.
author emellor@ewan
date Wed Sep 28 17:02:17 2005 +0100 (2005-09-28)
parents 33fc55a32dfb ce54669c70fc
children 1643f6110469
files tools/examples/xend-config.sxp tools/python/xen/xend/XendClient.py tools/python/xen/xend/XendDomain.py tools/python/xen/xend/server/SrvDomain.py tools/python/xen/xend/server/SrvDomainDir.py tools/python/xen/xm/main.py xen/arch/x86/shadow_public.c
line diff
     7.1 --- a/xen/arch/x86/shadow_public.c	Wed Sep 28 17:00:22 2005 +0100
     7.2 +++ b/xen/arch/x86/shadow_public.c	Wed Sep 28 17:02:17 2005 +0100
     7.3 @@ -256,7 +256,6 @@ void free_monitor_pagetable(struct vcpu 
     7.4  {
     7.5      unsigned long mfn;
     7.6  
     7.7 -    ASSERT( pagetable_val(v->arch.monitor_table) );
     7.8      /*
     7.9       * free monitor_table.
    7.10       * Note: for VMX guest, only BSP need do this free.