Rev 2087 | Rev 2701 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2087 | Rev 2697 | ||
|---|---|---|---|
| Line 59... | Line 59... | ||
| 59 | pfn_t start, conf; |
59 | pfn_t start, conf; |
| 60 | size_t size; |
60 | size_t size; |
| 61 | 61 | ||
| 62 | for (i = 0; i < e820counter; i++) { |
62 | for (i = 0; i < e820counter; i++) { |
| 63 | if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) { |
63 | if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) { |
| 64 | start = ADDR2PFN(ALIGN_UP(e820table[i].base_address, |
64 | start = ADDR2PFN(ALIGN_UP(e820table[i].base_address, FRAME_SIZE)); |
| 65 | FRAME_SIZE)); |
- | |
| 66 | size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size, |
65 | size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size, FRAME_SIZE)); |
| 67 | FRAME_SIZE)); |
- | |
| 68 | if (minconf < start || minconf >= start + size) |
66 | if ((minconf < start) || (minconf >= start + size)) |
| 69 | conf = start; |
67 | conf = start; |
| 70 | else |
68 | else |
| 71 | conf = minconf; |
69 | conf = minconf; |
| 72 | zone_create(start, size, conf, 0); |
70 | zone_create(start, size, conf, 0); |
| 73 | if (last_frame < ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE)) |
71 | if (last_frame < ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE)) |
| Line 114... | Line 112... | ||
| 114 | 112 | ||
| 115 | if (config.cpu_active == 1) { |
113 | if (config.cpu_active == 1) { |
| 116 | cmd_initialize(&e820_info); |
114 | cmd_initialize(&e820_info); |
| 117 | cmd_register(&e820_info); |
115 | cmd_register(&e820_info); |
| 118 | 116 | ||
| 119 | - | ||
| 120 | minconf = 1; |
117 | minconf = 1; |
| 121 | #ifdef CONFIG_SMP |
118 | #ifdef CONFIG_SMP |
| 122 | minconf = max(minconf, |
119 | minconf = max(minconf, |
| 123 | ADDR2PFN(AP_BOOT_OFFSET+hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size)); |
120 | ADDR2PFN(AP_BOOT_OFFSET + hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size)); |
| 124 | #endif |
121 | #endif |