DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-18 08:06:32 +00:00
Code Issues Releases Wiki Activity

merge master and fix conflicts

Browse Source
This commit is contained in:
fslongjin
2022-08-14 21:43:39 +08:00
parent daf8732bbd
commit f3cd2b7777
4 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/mm/mm.c
View File

@ -247,6 +247,8 @@ unsigned long page_init(struct Page *page, ul flags)
barrier();
++page->zone->total_pages_link;
}
page->anon_vma = NULL;
spin_init(&page->op_lock);
return 0;
}
@ -586,7 +588,7 @@ uint64_t mm_do_brk(uint64_t old_brk_end_addr, int64_t offset)
{
for (uint64_t i = old_brk_end_addr; i < end_addr; i += PAGE_2M_SIZE)
{
mm_map_vma(current_pcb->mm,i, PAGE_2M_SIZE, alloc_pages(ZONE_NORMAL, 1, PAGE_PGT_MAPPED)->addr_phys, VM_USER|VM_ACCESS_FLAGS, NULL);
mm_map_vma(current_pcb->mm, i, PAGE_2M_SIZE, alloc_pages(ZONE_NORMAL, 1, PAGE_PGT_MAPPED)->addr_phys, VM_USER | VM_ACCESS_FLAGS, NULL);
}
current_pcb->mm->brk_end = end_addr;
}
@ -614,4 +616,3 @@ uint64_t mm_do_brk(uint64_t old_brk_end_addr, int64_t offset)
}
return end_addr;
}