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

Commit 20f4eb3e authored by David Gibson's avatar David Gibson Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Fixup for STRICT_MM_TYPECHECKS 



Currently ARCH=powerpc will not compile when STRICT_MM_TYPECHECKS is
turned on and CONFIG_64K_PAGES is turned off.  This corrects the
problem.

Signed-off-by: default avatarDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent c6622f63

include/asm-powerpc/pgtable-4k.h

+8 −3
Original line number Diff line number Diff line
@@ -62,9 +62,14 @@ 
/* shift to put page number into pte */

#define PTE_RPN_SHIFT	(17)



#define __real_pte(e,p)		((real_pte_t)(e))

#define __rpte_to_pte(r)	(r)

#define __rpte_to_hidx(r,index)	(pte_val((r)) >> 12)

#ifdef STRICT_MM_TYPECHECKS

#define __real_pte(e,p)		((real_pte_t){(e)})

#define __rpte_to_pte(r)	((r).pte)

#else

#define __real_pte(e,p)		(e)

#define __rpte_to_pte(r)	(__pte(r))

#endif

#define __rpte_to_hidx(r,index)	(pte_val(__rpte_to_pte(r)) >> 12)



#define pte_iterate_hashed_subpages(rpte, psize, va, index, shift)       \

	do {							         \