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

warnings: init pte in process.c functions

Browse Source 
pte_make_fileoff() on arm does not always init the pte, so just
init it to PTE_NULL firsthand

Change-Id: If195c1aef5b1344f13f6c0c76bb431a5fa339265
This commit is contained in:
Dominique Martinet
2019-03-04 10:49:55 +09:00
committed by Dominique Martinet
parent 1b76aaa7e1
commit 3fbad79afb
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/process.c
View File

@@ -1534,7 +1534,7 @@ static int remap_one_page(void *arg0, page_table_t pt, pte_t *ptep,
const size_t pgsize = (size_t)1 << pgshift; const size_t pgsize = (size_t)1 << pgshift;
int error; int error;
off_t off; off_t off;
pte_t apte; pte_t apte = PTE_NULL;
uintptr_t phys; uintptr_t phys;
struct page *page; struct page *page;
@@ -1709,7 +1709,7 @@ static int invalidate_one_page(void *arg0, page_table_t pt, pte_t *ptep,
uintptr_t phys; uintptr_t phys;
struct page *page; struct page *page;
off_t linear_off; off_t linear_off;
pte_t apte; pte_t apte = PTE_NULL;
size_t memobj_pgsize; size_t memobj_pgsize;
dkprintf("invalidate_one_page(%p,%p,%p %#lx,%p,%d)\n", dkprintf("invalidate_one_page(%p,%p,%p %#lx,%p,%d)\n",
@@ -1724,15 +1724,10 @@ static int invalidate_one_page(void *arg0, page_table_t pt, pte_t *ptep,
linear_off = range->objoff + ((uintptr_t)pgaddr - range->start); linear_off = range->objoff + ((uintptr_t)pgaddr - range->start);
if (page) { if (page) {
if (page->offset == linear_off) { if (page->offset != linear_off) {
pte_make_null(&apte, pgsize);
}
else {
pte_make_fileoff(page->offset, 0, pgsize, pte_make_fileoff(page->offset, 0, pgsize,
&apte); &apte);
} }
} else {
pte_make_null(&apte, pgsize);
} }
pte_xchg(ptep, &apte); pte_xchg(ptep, &apte);