From: awilliam@xenbuild.aw <awilliam@xenbuild.aw>
Date: Tue, 29 Aug 2006 15:08:29 +0000 (-0600)
Subject: [IA64] revert xen-ia64-unstable.hg cset 11301:a19dbbe4cff5
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15677
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2894bb17210ef61bbac080a4a6b7b42222cd2479;p=xen.git

[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@jp.fujitsu.com>
Signed-off-by: Tomonari Horikoshi <t.horikoshi@jp.fujitsu.com>
---

diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c
index 719af71ff2..2073fd52c7 100644
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@ -402,16 +402,8 @@ fail_nomem:
 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);