Skip to content

Commit

Permalink
xen: add extra pages for E820 RAM regions, even if beyond mem_end
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeremy Fitzhardinge committed Oct 22, 2010
1 parent 36bc251 commit b5b43ce
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions arch/x86/xen/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,8 @@ char * __init xen_memory_setup(void)
xen_extra_mem_start = mem_end;
for (i = 0; i < memmap.nr_entries; i++) {
unsigned long long end = map[i].addr + map[i].size;

if (map[i].type == E820_RAM) {
if (map[i].addr > mem_end)
continue;
if (end > mem_end) {
/* Truncate region to max_mem. */
map[i].size -= end - mem_end;
Expand All @@ -169,7 +168,9 @@ char * __init xen_memory_setup(void)
}
} else if (map[i].type != E820_RAM)
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);
}

Expand Down

0 comments on commit b5b43ce

Please sign in to comment.