X-Git-Url: http://git.barrelfish.org/?p=barrelfish;a=blobdiff_plain;f=usr%2Finit%2Fmem_alloc.c;h=4a63af41a6bf90386c8435fcf3199daefed32011;hp=9c27298053d3fb5c3335cc721813f8ae17711c54;hb=d13c7d2fe6f5e3f82a035effcc10785c7fb03520;hpb=2fd5b62dbb5a249c3d461ad27e9ae2596f1fd521 diff --git a/usr/init/mem_alloc.c b/usr/init/mem_alloc.c index 9c27298..4a63af4 100644 --- a/usr/init/mem_alloc.c +++ b/usr/init/mem_alloc.c @@ -54,7 +54,7 @@ errval_t initialize_ram_alloc(void) * or else the next closest less than MM_MAXSIZEBITS */ int mem_region = -1, mem_slot = 0; struct capref mem_cap = { - .cnode = cnode_super0, + .cnode = cnode_super, .slot = 0, }; @@ -62,7 +62,7 @@ errval_t initialize_ram_alloc(void) for (int i = 0; i < bi->regions_length; i++) { assert(!bi->regions[i].mr_consumed); if (bi->regions[i].mr_type == RegionType_Empty) { - if (bi->regions[i].mr_bits >= MM_REQUIREDBITS + if (bi->regions[i].mr_bits >= MM_REQUIREDBITS && bi->regions[i].mr_bits <= MM_MAXSIZEBITS && (mem_region == -1 || bi->regions[i].mr_bits < bi->regions[mem_region].mr_bits)) { mem_region = i;