| 136,25 → 136,22 |
|---|
| /* Try to merge */ |
| if (zones.count+1 == ZONES_MAX) |
| panic("Maximum zone(%d) count exceeded.", ZONES_MAX); |
| |
| for (i=0; i < zones.count; i++) { |
| /* Check for overflow */ |
| z = zones.info[zones.count]; |
| z = zones.info[i]; |
| if (overlaps(newzone->base,newzone->count, |
| z->base, z->count)) { |
| printf("Zones overlap!\n"); |
| return -1; |
| } |
| if (z->base < newzone->base) |
| if (newzone->base < z->base) |
| break; |
| } |
| /* Move other zones up */ |
| for (j=i;j < zones.count;j++) |
| zones.info[j+1] = zones.info[j]; |
| |
| zones.info[i] = newzone; |
| zones.count++; |
| |
| spinlock_unlock(&zones.lock); |
| interrupts_restore(ipl); |
| |
| 843,7 → 840,6 |
|---|
| for (i=confframe; i<confframe+confcount; i++) { |
| zone_mark_unavailable(z, i - z->base); |
| } |
| |
| return znum; |
| } |
| |
| 995,8 → 991,9 |
|---|
| /* Tell the architecture to create some memory */ |
| frame_arch_init(); |
| if (config.cpu_active == 1) { |
| frame_mark_unavailable(ADDR2PFN(KA2PA(config.base)), |
| SIZE2FRAMES(config.kernel_size)); |
| pfn_t firstframe = ADDR2PFN(KA2PA(config.base)); |
| pfn_t lastframe = ADDR2PFN(KA2PA(config.base+config.kernel_size)); |
| frame_mark_unavailable(firstframe,lastframe-firstframe+1); |
| if (config.init_size > 0) |
| frame_mark_unavailable(ADDR2PFN(KA2PA(config.init_addr)), |
| SIZE2FRAMES(config.init_size)); |