Commit 40d192b6 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] remove 'prot_pte_ext' from memory type table 



This member is now redundant; the memory type is encoded in the Linux
PTE bits.

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

arch/arm/mm/ioremap.c

+1 −2
Original line number Diff line number Diff line
@@ -55,8 +55,7 @@ static int remap_area_pte(pmd_t *pmd, unsigned long addr, unsigned long end, 
		if (!pte_none(*pte))

			goto bad;



		set_pte_ext(pte, pfn_pte(phys_addr >> PAGE_SHIFT, prot),

			    type->prot_pte_ext);

		set_pte_ext(pte, pfn_pte(phys_addr >> PAGE_SHIFT, prot), 0);

		phys_addr += PAGE_SIZE;

	} while (pte++, addr += PAGE_SIZE, addr != end);

	return 0;

arch/arm/mm/mm.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ static inline pmd_t *pmd_off_k(unsigned long virt) 


struct mem_type {

	unsigned int prot_pte;

	unsigned int prot_pte_ext;

	unsigned int prot_l1;

	unsigned int prot_sect;

	unsigned int domain;

arch/arm/mm/mmu.c

+1 −2
Original line number Diff line number Diff line
@@ -418,8 +418,7 @@ static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, 


	pte = pte_offset_kernel(pmd, addr);

	do {

		set_pte_ext(pte, pfn_pte(pfn, __pgprot(type->prot_pte)),

			    type->prot_pte_ext);

		set_pte_ext(pte, pfn_pte(pfn, __pgprot(type->prot_pte)), 0);

		pfn++;

	} while (pte++, addr += PAGE_SIZE, addr != end);

}