Skip to content

Commit

Permalink
xen: make sure xen_extra_mem_start is beyond all non-RAM e820
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeremy Fitzhardinge committed Oct 22, 2010
1 parent 42ee147 commit 36bc251
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/x86/xen/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 36bc251

Please sign in to comment.