| 61,11 → 61,9 |
|---|
| |
| for (i = 0; i < e820counter; i++) { |
| if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) { |
| start = ADDR2PFN(ALIGN_UP(e820table[i].base_address, |
| FRAME_SIZE)); |
| size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size, |
| FRAME_SIZE)); |
| if (minconf < start || minconf >= start + size) |
| start = ADDR2PFN(ALIGN_UP(e820table[i].base_address, FRAME_SIZE)); |
| size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size, FRAME_SIZE)); |
| if ((minconf < start) || (minconf >= start + size)) |
| conf = start; |
| else |
| conf = minconf; |
| 111,16 → 109,15 |
|---|
| void frame_arch_init(void) |
| { |
| static pfn_t minconf; |
| |
| |
| if (config.cpu_active == 1) { |
| cmd_initialize(&e820_info); |
| cmd_register(&e820_info); |
| |
| |
| minconf = 1; |
| #ifdef CONFIG_SMP |
| minconf = max(minconf, |
| ADDR2PFN(AP_BOOT_OFFSET+hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size)); |
| ADDR2PFN(AP_BOOT_OFFSET + hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size)); |
| #endif |
| #ifdef CONFIG_SIMICS_FIX |
| minconf = max(minconf, ADDR2PFN(0x10000)); |
| 133,11 → 130,11 |
|---|
| #ifdef CONFIG_SMP |
| /* Reserve AP real mode bootstrap memory */ |
| frame_mark_unavailable(AP_BOOT_OFFSET >> FRAME_WIDTH, |
| (hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size) >> FRAME_WIDTH); |
| (hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size) >> FRAME_WIDTH); |
| |
| #ifdef CONFIG_SIMICS_FIX |
| /* Don't know why, but these addresses help */ |
| frame_mark_unavailable(0xd000 >> FRAME_WIDTH,3); |
| frame_mark_unavailable(0xd000 >> FRAME_WIDTH, 3); |
| #endif |
| #endif |
| } |