aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>2006-10-12 14:27:20 +0100
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>2006-10-12 14:27:20 +0100
commite5b046d973604ca755ece5d880f89d5b73491ba5 (patch)
tree881c5a807f49bc55f27e75983467316690d1d963
parent8b17a36d176b7164479b16cf4e539b899af0885e (diff)
downloadxen-e5b046d973604ca755ece5d880f89d5b73491ba5.tar.gz
xen-e5b046d973604ca755ece5d880f89d5b73491ba5.tar.bz2
xen-e5b046d973604ca755ece5d880f89d5b73491ba5.zip
[XEN] Fix booting with dom0_mem specifying 4GB or more.
Signed-off-by: Charles Coffing <ccoffing@novell.com>
-rw-r--r--xen/arch/x86/domain_build.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index 05b5c03c63..f858adab51 100644
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -401,11 +401,11 @@ int construct_dom0(struct domain *d,
_p(dsi.v_start), _p(v_end));
printk(" ENTRY ADDRESS: %p\n", _p(dsi.v_kernentry));
- if ( (v_end - dsi.v_start) > (nr_pages * PAGE_SIZE) )
+ if ( ((v_end - dsi.v_start)>>PAGE_SHIFT) > nr_pages )
{
printk("Initial guest OS requires too much space\n"
"(%luMB is greater than %luMB limit)\n",
- (v_end-dsi.v_start)>>20, (nr_pages<<PAGE_SHIFT)>>20);
+ (v_end-dsi.v_start)>>20, nr_pages>>(20-PAGE_SHIFT));
return -ENOMEM;
}