[Xen-changelog] [xen-unstable] [IA64] revert xen-ia64-unstable.hg cset 11301:a19dbbe4cff5

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

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 586c5fe8cf3e671231c0b9bcbfef9fec0aa251e4
# Parent  003fdc4f0a7c40f7c56154a275929b59ac58438f
[IA64] revert xen-ia64-unstable.hg cset 11301:a19dbbe4cff5

revert arch_domain_destory() for old PV-on-HVM on IPF

Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@xxxxxxxxxxxxxx>
Signed-off-by: Tomonari Horikoshi <t.horikoshi@xxxxxxxxxxxxxx>
---
 xen/arch/ia64/xen/domain.c |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff -r 003fdc4f0a7c -r 586c5fe8cf3e xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c        Tue Aug 29 09:05:46 2006 -0600
+++ b/xen/arch/ia64/xen/domain.c        Tue Aug 29 09:08:29 2006 -0600
@@ -402,16 +402,8 @@ void arch_domain_destroy(struct domain *
 void arch_domain_destroy(struct domain *d)
 {
        BUG_ON(d->arch.mm.pgd != NULL);
-       if (d->shared_info != NULL) {
-               /* If this domain is domVTi, the shared_info page may
-                * be replaced with domheap. Then the shared_info page
-                * frees in relinquish_mm().
-                */
-               if (IS_XEN_HEAP_FRAME(virt_to_page(d->shared_info))) {
-                       free_xenheap_pages(d->shared_info,
-                                          get_order_from_shift(XSI_SHIFT));
-               }
-       }
+       if (d->shared_info != NULL)
+           free_xenheap_pages(d->shared_info, get_order_from_shift(XSI_SHIFT));
        if (d->arch.shadow_bitmap != NULL)
                xfree(d->arch.shadow_bitmap);
 

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