From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Sat, 20 Nov 2010 07:27:06 +0000 (-0800)
Subject: xen: re-enable boot-time ballooning
X-Git-Tag: v2.6.37-rc4~60^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2a817130cdc142f1c80a8e60eca824a321926af;p=thirdparty%2Fkernel%2Flinux.git

xen: re-enable boot-time ballooning

Now that the balloon driver doesn't stumble over non-RAM pages, we
can enable the extra space for ballooning.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---

diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 769c4b01fa32e..630fb53c95f3c 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -248,8 +248,7 @@ char * __init xen_memory_setup(void)
 	else
 		extra_pages = 0;
 
-	if (!xen_initial_domain())
-		xen_add_extra_mem(extra_pages);
+	xen_add_extra_mem(extra_pages);
 
 	return "Xen";
 }