[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: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
David Gibson 2006-02-20 14:05:56 +11:00 committed by Paul Mackerras
parent c6622f63db
commit 20f4eb3e50

View File

@ -62,9 +62,14 @@
/* shift to put page number into pte */ /* shift to put page number into pte */
#define PTE_RPN_SHIFT (17) #define PTE_RPN_SHIFT (17)
#define __real_pte(e,p) ((real_pte_t)(e)) #ifdef STRICT_MM_TYPECHECKS
#define __rpte_to_pte(r) (r) #define __real_pte(e,p) ((real_pte_t){(e)})
#define __rpte_to_hidx(r,index) (pte_val((r)) >> 12) #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) \ #define pte_iterate_hashed_subpages(rpte, psize, va, index, shift) \
do { \ do { \