ARM: pgtable: use mk_pte rather than pfn_pte(page_to_pfn())
mk_pte is provided to do this translation for us, so use it rather than open-coding it in the copypage code. Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
de27c30822
commit
6e78df1761
|
@ -74,7 +74,7 @@ void v4_mc_copy_user_highpage(struct page *to, struct page *from,
|
|||
|
||||
raw_spin_lock(&minicache_lock);
|
||||
|
||||
set_pte_ext(TOP_PTE(COPYPAGE_MINICACHE), pfn_pte(page_to_pfn(from), minicache_pgprot), 0);
|
||||
set_pte_ext(TOP_PTE(COPYPAGE_MINICACHE), mk_pte(from, minicache_pgprot), 0);
|
||||
flush_tlb_kernel_page(COPYPAGE_MINICACHE);
|
||||
|
||||
mc_copy_user_page((void *)COPYPAGE_MINICACHE, kto);
|
||||
|
|
|
@ -90,8 +90,8 @@ static void v6_copy_user_highpage_aliasing(struct page *to,
|
|||
kfrom = COPYPAGE_V6_FROM + (offset << PAGE_SHIFT);
|
||||
kto = COPYPAGE_V6_TO + (offset << PAGE_SHIFT);
|
||||
|
||||
set_pte_ext(TOP_PTE(kfrom), pfn_pte(page_to_pfn(from), PAGE_KERNEL), 0);
|
||||
set_pte_ext(TOP_PTE(kto), pfn_pte(page_to_pfn(to), PAGE_KERNEL), 0);
|
||||
set_pte_ext(TOP_PTE(kfrom), mk_pte(from, PAGE_KERNEL), 0);
|
||||
set_pte_ext(TOP_PTE(kto), mk_pte(to, PAGE_KERNEL), 0);
|
||||
|
||||
flush_tlb_kernel_page(kfrom);
|
||||
flush_tlb_kernel_page(kto);
|
||||
|
@ -119,7 +119,7 @@ static void v6_clear_user_highpage_aliasing(struct page *page, unsigned long vad
|
|||
*/
|
||||
raw_spin_lock(&v6_lock);
|
||||
|
||||
set_pte_ext(TOP_PTE(to), pfn_pte(page_to_pfn(page), PAGE_KERNEL), 0);
|
||||
set_pte_ext(TOP_PTE(to), mk_pte(page, PAGE_KERNEL), 0);
|
||||
flush_tlb_kernel_page(to);
|
||||
clear_page((void *)to);
|
||||
|
||||
|
|
|
@ -94,7 +94,7 @@ void xscale_mc_copy_user_highpage(struct page *to, struct page *from,
|
|||
|
||||
raw_spin_lock(&minicache_lock);
|
||||
|
||||
set_pte_ext(TOP_PTE(COPYPAGE_MINICACHE), pfn_pte(page_to_pfn(from), minicache_pgprot), 0);
|
||||
set_pte_ext(TOP_PTE(COPYPAGE_MINICACHE), mk_pte(from, minicache_pgprot), 0);
|
||||
flush_tlb_kernel_page(COPYPAGE_MINICACHE);
|
||||
|
||||
mc_copy_user_page((void *)COPYPAGE_MINICACHE, kto);
|
||||
|
|
Loading…
Reference in New Issue