]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
xen: re-enable boot-time ballooning
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Sat, 20 Nov 2010 07:27:06 +0000 (23:27 -0800)
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Sat, 20 Nov 2010 07:28:08 +0000 (23:28 -0800)
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>
arch/x86/xen/setup.c

index 769c4b01fa32e11f01e3a77a37d42f4c8ab13207..630fb53c95f3c5910fde374f70491dd0123dcf04 100644 (file)
@@ -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";
 }