Merge branch 'stable/e820-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/e820-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: release all pages within 1-1 p2m mappings
  xen: allow extra memory to be in multiple regions
  xen: allow balloon driver to use more than one memory region
  xen/balloon: simplify test for the end of usable RAM
  xen/balloon: account for pages released during memory setup
This commit is contained in:
Linus Torvalds
2011-10-25 09:17:07 +02:00
3 changed files with 161 additions and 177 deletions
+11 -1
View File
@@ -3,6 +3,16 @@
#include <asm/xen/page.h>
extern phys_addr_t xen_extra_mem_start, xen_extra_mem_size;
struct xen_memory_region {
phys_addr_t start;
phys_addr_t size;
};
#define XEN_EXTRA_MEM_MAX_REGIONS 128 /* == E820MAX */
extern __initdata
struct xen_memory_region xen_extra_mem[XEN_EXTRA_MEM_MAX_REGIONS];
extern unsigned long xen_released_pages;
#endif /* _XEN_PAGE_H */