aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/e820.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index e03b89ac8f2b..d3f6c5f6d3b1 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -487,17 +487,19 @@ void __init update_e820(void)
487 printk(KERN_INFO "modified physical RAM map:\n"); 487 printk(KERN_INFO "modified physical RAM map:\n");
488 e820_print_map("modified"); 488 e820_print_map("modified");
489} 489}
490 490#define MAX_GAP_END 0x100000000ull
491/* 491/*
492 * Search for a gap in the e820 memory space from start_addr to 2^32. 492 * Search for a gap in the e820 memory space from start_addr to end_addr.
493 */ 493 */
494__init int e820_search_gap(unsigned long *gapstart, unsigned long *gapsize, 494__init int e820_search_gap(unsigned long *gapstart, unsigned long *gapsize,
495 unsigned long start_addr) 495 unsigned long start_addr, unsigned long long end_addr)
496{ 496{
497 unsigned long long last = 0x100000000ull; 497 unsigned long long last;
498 int i = e820.nr_map; 498 int i = e820.nr_map;
499 int found = 0; 499 int found = 0;
500 500
501 last = (end_addr && end_addr < MAX_GAP_END) ? end_addr : MAX_GAP_END;
502
501 while (--i >= 0) { 503 while (--i >= 0) {
502 unsigned long long start = e820.map[i].addr; 504 unsigned long long start = e820.map[i].addr;
503 unsigned long long end = start + e820.map[i].size; 505 unsigned long long end = start + e820.map[i].size;
@@ -537,7 +539,7 @@ __init void e820_setup_gap(void)
537 539
538 gapstart = 0x10000000; 540 gapstart = 0x10000000;
539 gapsize = 0x400000; 541 gapsize = 0x400000;
540 found = e820_search_gap(&gapstart, &gapsize, 0); 542 found = e820_search_gap(&gapstart, &gapsize, 0, MAX_GAP_END);
541 543
542#ifdef CONFIG_X86_64 544#ifdef CONFIG_X86_64
543 if (!found) { 545 if (!found) {