Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad1ae2fe authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Unuse another Linux PTE bit 



L_PTE_ASID is not really required to be stored in every PTE, since we
can identify it via the address passed to set_pte_at().  So, create
set_pte_ext() which takes the address of the PTE to set, the Linux
PTE value, and the additional CPU PTE bits which aren't encoded in
the Linux PTE value.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f06b97ff

arch/arm/mm/consistent.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ __dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp, 
			 * x86 does not mark the pages reserved...

			 */

			SetPageReserved(page);

			set_pte(pte, mk_pte(page, prot));

			set_pte_ext(pte, mk_pte(page, prot), 0);

			page++;

			pte++;

			off++;

arch/arm/mm/copypage-v4mc.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void v4_mc_copy_user_page(void *kto, const void *kfrom, unsigned long vaddr) 
{

	spin_lock(&minicache_lock);



	set_pte(TOP_PTE(0xffff8000), pfn_pte(__pa(kfrom) >> PAGE_SHIFT, minicache_pgprot));

	set_pte_ext(TOP_PTE(0xffff8000), pfn_pte(__pa(kfrom) >> PAGE_SHIFT, minicache_pgprot), 0);

	flush_tlb_kernel_page(0xffff8000);



	mc_copy_user_page((void *)0xffff8000, kto);

arch/arm/mm/copypage-v6.c

+3 −3
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ static void v6_copy_user_page_aliasing(void *kto, const void *kfrom, unsigned lo 
	 */

	spin_lock(&v6_lock);



	set_pte(TOP_PTE(from_address) + offset, pfn_pte(__pa(kfrom) >> PAGE_SHIFT, PAGE_KERNEL));

	set_pte(TOP_PTE(to_address) + offset, pfn_pte(__pa(kto) >> PAGE_SHIFT, PAGE_KERNEL));

	set_pte_ext(TOP_PTE(from_address) + offset, pfn_pte(__pa(kfrom) >> PAGE_SHIFT, PAGE_KERNEL), 0);

	set_pte_ext(TOP_PTE(to_address) + offset, pfn_pte(__pa(kto) >> PAGE_SHIFT, PAGE_KERNEL), 0);



	from = from_address + (offset << PAGE_SHIFT);

	to   = to_address + (offset << PAGE_SHIFT);
@@ -110,7 +110,7 @@ static void v6_clear_user_page_aliasing(void *kaddr, unsigned long vaddr) 
	 */

	spin_lock(&v6_lock);



	set_pte(TOP_PTE(to_address) + offset, pfn_pte(__pa(kaddr) >> PAGE_SHIFT, PAGE_KERNEL));

	set_pte_ext(TOP_PTE(to_address) + offset, pfn_pte(__pa(kaddr) >> PAGE_SHIFT, PAGE_KERNEL), 0);

	flush_tlb_kernel_page(to);

	clear_page((void *)to);

arch/arm/mm/copypage-xscale.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ void xscale_mc_copy_user_page(void *kto, const void *kfrom, unsigned long vaddr) 
{

	spin_lock(&minicache_lock);



	set_pte(TOP_PTE(COPYPAGE_MINICACHE), pfn_pte(__pa(kfrom) >> PAGE_SHIFT, minicache_pgprot));

	set_pte_ext(TOP_PTE(COPYPAGE_MINICACHE), pfn_pte(__pa(kfrom) >> PAGE_SHIFT, minicache_pgprot), 0);

	flush_tlb_kernel_page(COPYPAGE_MINICACHE);



	mc_copy_user_page((void *)COPYPAGE_MINICACHE, kto);

arch/arm/mm/fault-armv.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static int adjust_pte(struct vm_area_struct *vma, unsigned long address) 
	if (pte_present(entry) && pte_val(entry) & shared_pte_mask) {

		flush_cache_page(vma, address, pte_pfn(entry));

		pte_val(entry) &= ~shared_pte_mask;

		set_pte(pte, entry);

		set_pte_at(vma->vm_mm, address, pte, entry);

		flush_tlb_page(vma, address);

		ret = 1;

	}