From: Jimi Xenidis <jimix@watson.ibm.com>
Date: Mon, 28 Aug 2006 21:28:55 +0000 (-0400)
Subject: [XEN][POWERPC] do not set d->tot_pages, but check it.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15673^2~26
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=21cfedd51e7abe94d26c012b0739b9c02aaa1004;p=xen.git

[XEN][POWERPC] do not set d->tot_pages, but check it.
Signed-off-by: Jimi Xenidis <jimix@watson.ibm.com>
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
---

diff --git a/xen/arch/powerpc/domain_build.c b/xen/arch/powerpc/domain_build.c
index f05cd55cc1..7858cb3c50 100644
--- a/xen/arch/powerpc/domain_build.c
+++ b/xen/arch/powerpc/domain_build.c
@@ -163,12 +163,10 @@ int construct_dom0(struct domain *d,
     }
 
     /* make sure we are at least as big as the RMA */
-    if (dom0_nrpages < rma_nrpages)
-        dom0_nrpages = rma_nrpages;
-    else
+    if (dom0_nrpages > rma_nrpages)
         dom0_nrpages = allocate_extents(d, dom0_nrpages, rma_nrpages);
 
-    d->tot_pages = dom0_nrpages;
+    ASSERT(d->tot_pages == dom0_nrpages);
     ASSERT(d->tot_pages >= rma_nrpages);
 
     if (opt_dom0_shadow == 0) {