diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2006-02-20 14:05:56 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-24 14:05:58 +1100 |
| commit | 20f4eb3e502d68b12224577ebcd2cd50cc6e14e4 (patch) | |
| tree | 5b5f1d857c13d6e3bcc757273fcd8cfffa1a1537 /include/asm-powerpc | |
| parent | c6622f63db86fcbd41bf6fe05ddf2e00c1e51ced (diff) | |
| download | kernel_samsung_smdk4412-20f4eb3e502d68b12224577ebcd2cd50cc6e14e4.zip kernel_samsung_smdk4412-20f4eb3e502d68b12224577ebcd2cd50cc6e14e4.tar.gz kernel_samsung_smdk4412-20f4eb3e502d68b12224577ebcd2cd50cc6e14e4.tar.bz2 | |
[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>
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/pgtable-4k.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/asm-powerpc/pgtable-4k.h b/include/asm-powerpc/pgtable-4k.h index e9590c0..35f9281 100644 --- a/include/asm-powerpc/pgtable-4k.h +++ b/include/asm-powerpc/pgtable-4k.h @@ -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 { \ |