summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-09-02 17:07:03 -0700
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-10-22 12:57:28 -0700
commit36bc251b87f88147e9d8346e4b431f42353c3d38 (patch)
treedf852a732d4ef6b90aa15ac026a46d2e4f0ae62a /arch
parent42ee1471e9b879479a15debac752314a596c738e (diff)
downloadop-kernel-dev-36bc251b87f88147e9d8346e4b431f42353c3d38.zip
op-kernel-dev-36bc251b87f88147e9d8346e4b431f42353c3d38.tar.gz
xen: make sure xen_extra_mem_start is beyond all non-RAM e820
If Xen gives us non-RAM E820 entries (dom0 only, typically), then make sure the extra RAM region is beyond them. It's OK for the extra space to grow into E820 regions, however. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
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 f9a99ea..eac0100 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -167,7 +167,8 @@ char * __init xen_memory_setup(void)
extra_pages += PFN_DOWN(end - mem_end);
}
- }
+ } else if (map[i].type != E820_RAM)
+ xen_extra_mem_start = end;
if (map[i].size > 0)
e820_add_region(map[i].addr, map[i].size, map[i].type);
}
OpenPOWER on IntegriCloud