Revert "fix REQ-37: remap_one_page: remove to check page size"

This reverts commit 6790126a23.

- reverted commit should remove a 'pgsize' check in remap_one_page()
  instead of a 'pgsize' check in pte_make_fileoff().
- In IA-32e, PTE format varies with page size. Therefore 'pgsize'
  parameter of pte_make_fileoff() is preferable.
This commit is contained in:
NAKAMURA Gou
2016-04-21 22:55:57 +09:00
parent e2e0fad849
commit 328175547f
2 changed files with 3 additions and 7 deletions

View File

@ -1266,7 +1266,7 @@ static int remap_one_page(void *arg0, page_table_t pt, pte_t *ptep,
}
off = args->off + ((uintptr_t)pgaddr - args->start);
pte_make_fileoff(off, 0, &apte);
pte_make_fileoff(off, 0, pgsize, &apte);
pte_xchg(ptep, &apte);
flush_tlb_single((uintptr_t)pgaddr); /* XXX: TLB flush */
@ -1425,7 +1425,7 @@ static int invalidate_one_page(void *arg0, page_table_t pt, pte_t *ptep,
pte_make_null(&apte, pgsize);
}
else {
pte_make_fileoff(page->offset, 0, &apte);
pte_make_fileoff(page->offset, 0, pgsize, &apte);
}
pte_xchg(ptep, &apte);
flush_tlb_single((uintptr_t)pgaddr); /* XXX: TLB flush */