diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 03:17:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 03:17:07 -0400 |
| commit | 5eef150c1d7e41baaefd00dd56c153debcd86aee (patch) | |
| tree | 612723d8b0930ba8c6292cd317231249713c1877 /include | |
| parent | 315eb8a2a1b7f335d40ceeeb11b9e067475eb881 (diff) | |
| parent | f3f436e33b925ead21e3f9b47b1e2aed965511d9 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/page.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/xen/page.h b/include/xen/page.h index 0be36b976f4b..12765b6f9517 100644 --- a/include/xen/page.h +++ b/include/xen/page.h | |||
| @@ -3,6 +3,16 @@ | |||
| 3 | 3 | ||
| 4 | #include <asm/xen/page.h> | 4 | #include <asm/xen/page.h> |
| 5 | 5 | ||
| 6 | extern phys_addr_t xen_extra_mem_start, xen_extra_mem_size; | 6 | struct xen_memory_region { |
| 7 | phys_addr_t start; | ||
| 8 | phys_addr_t size; | ||
| 9 | }; | ||
| 10 | |||
| 11 | #define XEN_EXTRA_MEM_MAX_REGIONS 128 /* == E820MAX */ | ||
| 12 | |||
| 13 | extern __initdata | ||
| 14 | struct xen_memory_region xen_extra_mem[XEN_EXTRA_MEM_MAX_REGIONS]; | ||
| 15 | |||
| 16 | extern unsigned long xen_released_pages; | ||
| 7 | 17 | ||
| 8 | #endif /* _XEN_PAGE_H */ | 18 | #endif /* _XEN_PAGE_H */ |