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

Commit 97092e0c authored by Russell King's avatar Russell King
Browse files

ARM: pgtable: use phys_addr_t for physical addresses 



Ensure that physical addresses are typed as phys_addr_t

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

arch/arm/include/asm/pgalloc.h

+5 −3
Original line number Diff line number Diff line
@@ -103,8 +103,10 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte) 
	__free_page(pte);

}



static inline void __pmd_populate(pmd_t *pmdp, unsigned long pmdval)

static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,

	unsigned long prot)

{

	unsigned long pmdval = pte | prot;

	pmdp[0] = __pmd(pmdval);

	pmdp[1] = __pmd(pmdval + 256 * sizeof(pte_t));

	flush_pmd_entry(pmdp);
@@ -126,13 +128,13 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep) 
	 * address of the PTE table

	 */

	pte_ptr -= PTRS_PER_PTE * sizeof(void *);

	__pmd_populate(pmdp, __pa(pte_ptr) | _PAGE_KERNEL_TABLE);

	__pmd_populate(pmdp, __pa(pte_ptr), _PAGE_KERNEL_TABLE);

}



static inline void

pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep)

{

	__pmd_populate(pmdp, page_to_pfn(ptep) << PAGE_SHIFT | _PAGE_USER_TABLE);

	__pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE);

}

#define pmd_pgtable(pmd) pmd_page(pmd)

arch/arm/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; 


static inline pte_t *pmd_page_vaddr(pmd_t pmd)

{

	unsigned long ptr;

	phys_addr_t ptr;



	ptr = pmd_val(pmd) & ~(PTRS_PER_PTE * sizeof(void *) - 1);

	ptr += PTRS_PER_PTE * sizeof(void *);

arch/arm/mm/mmu.c

+4 −3
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ static pte_t * __init early_pte_alloc(pmd_t *pmd, unsigned long addr, unsigned l 
{

	if (pmd_none(*pmd)) {

		pte_t *pte = early_alloc(2 * PTRS_PER_PTE * sizeof(pte_t));

		__pmd_populate(pmd, __pa(pte) | prot);

		__pmd_populate(pmd, __pa(pte), prot);

	}

	BUG_ON(pmd_bad(*pmd));

	return pte_offset_kernel(pmd, addr);
@@ -553,7 +553,7 @@ static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, 
}



static void __init alloc_init_section(pgd_t *pgd, unsigned long addr,

				      unsigned long end, unsigned long phys,

				      unsigned long end, phys_addr_t phys,

				      const struct mem_type *type)

{

	pmd_t *pmd = pmd_offset(pgd, addr);
@@ -588,7 +588,8 @@ static void __init alloc_init_section(pgd_t *pgd, unsigned long addr, 
static void __init create_36bit_mapping(struct map_desc *md,

					const struct mem_type *type)

{

	unsigned long phys, addr, length, end;

	unsigned long addr, length, end;

	phys_addr_t phys;

	pgd_t *pgd;



	addr = md->virtual;