diff options
Diffstat (limited to 'arch/x86/xen/setup.c')
| -rw-r--r-- | arch/x86/xen/setup.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index c3b8d440873c..46d6d21dbdbe 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c | |||
| @@ -306,10 +306,12 @@ char * __init xen_memory_setup(void) | |||
| 306 | sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); | 306 | sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); |
| 307 | 307 | ||
| 308 | extra_limit = xen_get_max_pages(); | 308 | extra_limit = xen_get_max_pages(); |
| 309 | if (extra_limit >= max_pfn) | 309 | if (max_pfn + extra_pages > extra_limit) { |
| 310 | extra_pages = extra_limit - max_pfn; | 310 | if (extra_limit > max_pfn) |
| 311 | else | 311 | extra_pages = extra_limit - max_pfn; |
| 312 | extra_pages = 0; | 312 | else |
| 313 | extra_pages = 0; | ||
| 314 | } | ||
| 313 | 315 | ||
| 314 | extra_pages += xen_return_unused_memory(xen_start_info->nr_pages, &e820); | 316 | extra_pages += xen_return_unused_memory(xen_start_info->nr_pages, &e820); |
| 315 | 317 | ||