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

Commit 5dd4e4f6 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/mm: Change setbat() to take a pgprot_t rather than flags 



The callers of setbat() are actually passing a pgprot_t for the flags
parameter. This doesn't matter unless STRICT_MM_TYPECHECKS is enabled.
So we can turn that on without breaking the build, change setbat() to
take a pgprot_t and have it convert it to an unsigned long internally.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 91108335

arch/powerpc/mm/mmu_decl.h

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ extern void _tlbia(void); 
extern void mapin_ram(void);

extern int map_page(unsigned long va, phys_addr_t pa, int flags);

extern void setbat(int index, unsigned long virt, phys_addr_t phys,

		   unsigned int size, int flags);

		   unsigned int size, pgprot_t prot);



extern int __map_without_bats;

extern int __allow_ioremap_reserved;

arch/powerpc/mm/ppc_mmu_32.c

+2 −1
Original line number Diff line number Diff line
@@ -113,11 +113,12 @@ unsigned long __init mmu_mapin_ram(unsigned long top) 
 * of 2 between 128k and 256M.

 */

void __init setbat(int index, unsigned long virt, phys_addr_t phys,

		   unsigned int size, int flags)

		   unsigned int size, pgprot_t prot)

{

	unsigned int bl;

	int wimgxpp;

	struct ppc_bat *bat = BATS[index];

	unsigned long flags = pgprot_val(prot);



	if ((flags & _PAGE_NO_CACHE) ||

	    (cpu_has_feature(CPU_FTR_NEED_COHERENT) == 0))