aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Vrabel <david.vrabel@citrix.com>2011-08-24 09:34:54 +0100
committerDavid Vrabel <david.vrabel@citrix.com>2011-08-24 09:34:54 +0100
commita2776e5ecf6371cd9b980f9e5ac5a56fba7a635a (patch)
treec0f7d4a5d8ce91e96235d34bf4e8ef7e302e90c2
parentb7797d5854da9f382841d1d758f69c59b6b7616f (diff)
downloadxen-a2776e5ecf6371cd9b980f9e5ac5a56fba7a635a.tar.gz
xen-a2776e5ecf6371cd9b980f9e5ac5a56fba7a635a.tar.bz2
xen-a2776e5ecf6371cd9b980f9e5ac5a56fba7a635a.zip
x86: don't limit dom0's maximum reservation by the available memory
Set dom0's initial maximum reservation using the max value supplied in the dom0_mem command line option without limiting it by the available memory. This allows dom0 to make use of any hotplugged memory without having to also adjust the maximum reservation. Signed-off-by: David Vrabel <david.vrabel@citrix.com> Acked-by: Jan Beulich <jbeulich@novell.com> xen-unstable changeset: 23790:1515138fbd7b xen-unstable date: Wed Aug 24 09:33:10 2011 +0100
-rw-r--r--xen/arch/x86/domain_build.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index 00cb3830d8..82850484c0 100644
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -253,7 +253,7 @@ static unsigned long __init compute_dom0_nr_pages(
}
#endif
- d->max_pages = min(max_pages, avail);
+ d->max_pages = min_t(unsigned long, max_pages, UINT_MAX);
return nr_pages;
}