gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'postk_master' into development

Browse Source 
* Merge 53e436ae7db1ed457692dbe16ccb15511aa6bc64
* Only arm64 stuff are left

Change-Id: I6b79de1f659fa61e75f44811b639d41f9a37d6cc
This commit is contained in:
Masamichi Takagi
2019-01-09 12:01:04 +09:00
committed by Dominique Martinet
parent d4d78e9c61
commit 25ef4e9261
12 changed files with 219 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm64/kernel/memory.c
View File

@ -824,7 +824,7 @@ static void setup_l2(translation_table_t *tt,
eidx = PTL2_ENTRIES - 1;
} else {
//base_endが現在のテーブルの管理内ならインデックスを算出
virt_end = (unsigned long)phys_to_virt(base_end);
virt_end = (unsigned long)phys_to_virt(base_end - 1);
eidx = ptl2_index(virt_end);
}
@ -847,7 +847,6 @@ static void setup_l2(translation_table_t *tt,
}
}
static inline void setup_middle_level(translation_table_t *tt, unsigned long base_start, unsigned long base_end,
setup_normal_area_t setup, int shift, unsigned long pgsize, int entries, int level)
{
@ -870,7 +869,7 @@ static inline void setup_middle_level(translation_table_t *tt, unsigned long bas
eidx = entries - 1;
} else {
//base_endが現在のテーブルの管理内ならインデックスを算出
virt_end = (unsigned long)phys_to_virt(base_end);
virt_end = (unsigned long)phys_to_virt(base_end - 1);
eidx = ptl_index(virt_end, level);
}
@ -2357,6 +2356,9 @@ static int clear_range(struct page_table *pt, struct process_vm *vm,
dkprintf("%s: %p,%lx,%lx,%d,%p\n",
__func__, pt, start, end, free_physical, memobj);
dkprintf("%s: %p,%lx,%lx,%d,%p\n",
__func__, pt, start, end, free_physical, memobj);
if ((start < vm->region.user_start)
|| (vm->region.user_end < end)
|| (end <= start)) {