aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-11-19 23:27:06 -0800
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-11-19 23:28:08 -0800
commitd2a817130cdc142f1c80a8e60eca824a321926af (patch)
treede6725428086c100151ed2d67f4eb46f63614345
parentxen/balloon: make sure we only include remaining extra ram (diff)
downloadlinux-dev-d2a817130cdc142f1c80a8e60eca824a321926af.tar.xz
linux-dev-d2a817130cdc142f1c80a8e60eca824a321926af.zip
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>
-rw-r--r--arch/x86/xen/setup.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 769c4b01fa32..630fb53c95f3 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";
}