[Xen-changelog] Merge.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User emellor@ewan
# Node ID 9e0b6fbab872914c07f837e0d53142f3cb9cfee5
# Parent  33fc55a32dfb137d24085ea6822d41484a4cf537
# Parent  ce54669c70fced4e8647065bfe6acf5efb147f98
Merge.

diff -r 33fc55a32dfb -r 9e0b6fbab872 xen/arch/x86/shadow_public.c
--- a/xen/arch/x86/shadow_public.c      Wed Sep 28 16:00:22 2005
+++ b/xen/arch/x86/shadow_public.c      Wed Sep 28 16:02:17 2005
@@ -256,7 +256,6 @@
 {
     unsigned long mfn;
 
-    ASSERT( pagetable_val(v->arch.monitor_table) );
     /*
      * free monitor_table.
      * Note: for VMX guest, only BSP need do this free.

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