summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorIan Campbell <ijc@hellion.org.uk>2008-02-28 23:16:49 +0000
committerIngo Molnar <mingo@elte.hu>2008-03-04 17:10:12 +0100
commit87d034f3139b5f0d93df2ba58f37d6f2c2c7eeb6 (patch)
tree07959e3e5cf3865d1cb4645de5bbd906245c9684 /arch
parent7c9e92b6cdc9937eee53600e5d49a25e421463dd (diff)
downloadlinux-3.10-87d034f3139b5f0d93df2ba58f37d6f2c2c7eeb6.tar.gz
linux-3.10-87d034f3139b5f0d93df2ba58f37d6f2c2c7eeb6.tar.bz2
linux-3.10-87d034f3139b5f0d93df2ba58f37d6f2c2c7eeb6.zip
x86/xen: fix DomU boot problem
Construct Xen guest e820 map with a hole between 640K-1M. It's pure luck that Xen kernels have gotten away with it in the past. The patch below seems like the right thing to do. It certainly boots in a domU without the DMI problem (without any of the other related patches such as Alexander's). Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Jeremy Fitzhardinge <jeremy@goop.org> Tested-by: Mark McLoughlin <markmc@redhat.com> Acked-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Acked-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/xen/setup.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 3bad4773a2f..2341492bf7a 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -38,7 +38,8 @@ char * __init xen_memory_setup(void)
unsigned long max_pfn = xen_start_info->nr_pages;
e820.nr_map = 0;
- add_memory_region(0, PFN_PHYS(max_pfn), E820_RAM);
+ add_memory_region(0, LOWMEMSIZE(), E820_RAM);
+ add_memory_region(HIGH_MEMORY, PFN_PHYS(max_pfn)-HIGH_MEMORY, E820_RAM);
return "Xen";
}