From 3fbad79afb293476a0a0e70e5c04d9bd6740003d Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Mon, 4 Mar 2019 10:49:55 +0900 Subject: [PATCH] warnings: init pte in process.c functions pte_make_fileoff() on arm does not always init the pte, so just init it to PTE_NULL firsthand Change-Id: If195c1aef5b1344f13f6c0c76bb431a5fa339265 --- kernel/process.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/kernel/process.c b/kernel/process.c index ca60ae34..0d0112d3 100644 --- a/kernel/process.c +++ b/kernel/process.c @@ -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; int error; off_t off; - pte_t apte; + pte_t apte = PTE_NULL; uintptr_t phys; struct page *page; @@ -1709,7 +1709,7 @@ static int invalidate_one_page(void *arg0, page_table_t pt, pte_t *ptep, uintptr_t phys; struct page *page; off_t linear_off; - pte_t apte; + pte_t apte = PTE_NULL; size_t memobj_pgsize; 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); if (page) { - if (page->offset == linear_off) { - pte_make_null(&apte, pgsize); - } - else { + if (page->offset != linear_off) { pte_make_fileoff(page->offset, 0, pgsize, &apte); } - } else { - pte_make_null(&apte, pgsize); } pte_xchg(ptep, &apte);