| /kernel/trunk/generic/src/mm/vm.c |
|---|
| 70,7 → 70,7 |
| pte_t *src_ptl0, *dst_ptl0; |
| src_ptl0 = (pte_t *) PA2KA((__address) GET_PTL0_ADDRESS()); |
| dst_ptl0 = (pte_t *) frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME); |
| dst_ptl0 = (pte_t *) frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME, NULL); |
| // memsetb((__address) dst_ptl0, PAGE_SIZE, 0); |
| // memcpy((void *) &dst_ptl0[KAS_START_INDEX], (void *) &src_ptl0[KAS_START_INDEX], KAS_INDICES); |
| 116,7 → 116,7 |
| } |
| for (i=0; i<size; i++) |
| a->mapping[i] = frame_alloc(0, ONE_FRAME); |
| a->mapping[i] = frame_alloc(0, ONE_FRAME, NULL); |
| spinlock_initialize(&a->lock, "vm_area_lock"); |
| /kernel/trunk/generic/src/mm/frame.c |
|---|
| 83,7 → 83,7 |
| * |
| * @return Allocated frame. |
| */ |
| __address frame_alloc(int flags, __u8 order) |
| __address frame_alloc(int flags, __u8 order, int * status) |
| { |
| ipl_t ipl; |
| link_t *cur, *tmp; |
| 117,6 → 117,8 |
| if (flags & FRAME_PANIC) |
| panic("Can't allocate frame.\n"); |
| /* |
| * TODO: Sleep until frames are available again. |
| */ |
| 123,6 → 125,12 |
| spinlock_unlock(&zone_head_lock); |
| interrupts_restore(ipl); |
| if (flags & FRAME_NON_BLOCKING) { |
| ASSERT(status != NULL); |
| *status = FRAME_NO_MEMORY; |
| return NULL; |
| } |
| panic("Sleep not implemented.\n"); |
| goto loop; |
| } |
| 151,6 → 159,11 |
| if (flags & FRAME_KA) |
| v = PA2KA(v); |
| if (flags & FRAME_NON_BLOCKING) { |
| ASSERT(status != NULL); |
| *status = FRAME_OK; |
| } |
| return v; |
| } |