diff options
| author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2011-04-12 12:19:52 +0100 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-04-20 09:04:40 -0400 |
| commit | 24bdb0b62cc82120924762ae6bc85afc8c3f2b26 (patch) | |
| tree | 9f7f3ee5d73716d744eb16f287cadcd370f81e78 /arch | |
| parent | f0e615c3cb72b42191b558c130409335812621d8 (diff) | |
| download | op-kernel-dev-24bdb0b62cc82120924762ae6bc85afc8c3f2b26.zip op-kernel-dev-24bdb0b62cc82120924762ae6bc85afc8c3f2b26.tar.gz | |
xen: do not create the extra e820 region at an addr lower than 4G
Do not add the extra e820 region at a physical address lower than 4G
because it breaks e820_end_of_low_ram_pfn().
It is OK for us to move the xen_extra_mem_start up and down because this
is the index of the memory that can be ballooned in/out - it is memory
not available to the kernel during bootup.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/xen/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index fa0269a..90bac0a 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -227,7 +227,7 @@ char * __init xen_memory_setup(void) memcpy(map_raw, map, sizeof(map)); e820.nr_map = 0; - xen_extra_mem_start = mem_end; + xen_extra_mem_start = max((1ULL << 32), mem_end); for (i = 0; i < memmap.nr_entries; i++) { unsigned long long end; |
