leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xen: add extra pages for E820 RAM regions, even if beyond mem_end

Browse Source 
If an entire E820 RAM region is beyond mem_end, still add its
pages to the extra area so that space can be used by the kernel.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
This commit is contained in:
Jeremy Fitzhardinge 2010-09-02 17:10:12 -07:00
parent 36bc251b87
commit b5b43ced7a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/x86/xen/setup.c
View File

@ -158,9 +158,8 @@ char * __init xen_memory_setup(void)
xen_extra_mem_start = mem_end; xen_extra_mem_start = mem_end;
for (i = 0; i < memmap.nr_entries; i++) { for (i = 0; i < memmap.nr_entries; i++) {
unsigned long long end = map[i].addr + map[i].size; unsigned long long end = map[i].addr + map[i].size;
if (map[i].type == E820_RAM) { if (map[i].type == E820_RAM) {
if (map[i].addr > mem_end)
continue;
if (end > mem_end) { if (end > mem_end) {
/* Truncate region to max_mem. */ /* Truncate region to max_mem. */
map[i].size -= end - mem_end; map[i].size -= end - mem_end;
@ -169,7 +168,9 @@ char * __init xen_memory_setup(void)
} }
} else if (map[i].type != E820_RAM) } else if (map[i].type != E820_RAM)
xen_extra_mem_start = end; xen_extra_mem_start = end;
if (map[i].size > 0)
if ((map[i].type != E820_RAM || map[i].addr < mem_end) &&
map[i].size > 0)
e820_add_region(map[i].addr, map[i].size, map[i].type); e820_add_region(map[i].addr, map[i].size, map[i].type);
} }