diff options
| author |   Christophe Leroy <christophe.leroy@c-s.fr> | 2016-02-09 17:07:58 +0100 |
|---|---|---|
| committer |   Scott Wood <oss@buserror.net> | 2016-03-11 17:18:02 -0600 |
| commit | 3084cdb7cd6a1609d0a4480291f5e4da80765d03 (patch) | |
| tree | d8d20ff4c28fc0dc4a3d3e4765f3f24d77d97198 /arch/powerpc/mm/mmu_decl.h | |
| parent | powerpc32: Fix pte_offset_kernel() to return NULL for bad pages (diff) | |
| download | linux-dev-3084cdb7cd6a1609d0a4480291f5e4da80765d03.tar.xz linux-dev-3084cdb7cd6a1609d0a4480291f5e4da80765d03.zip | |
powerpc32: refactor x_mapped_by_bats() and x_mapped_by_tlbcam() together
x_mapped_by_bats() and x_mapped_by_tlbcam() serve the same kind of
purpose, and are never defined at the same time.
So rename them x_block_mapped() and define them in the relevant
places
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'arch/powerpc/mm/mmu_decl.h')
| -rw-r--r-- | arch/powerpc/mm/mmu_decl.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h index 718076ff0b8a..4b85077d4828 100644 --- a/arch/powerpc/mm/mmu_decl.h +++ b/arch/powerpc/mm/mmu_decl.h @@ -159,3 +159,13 @@ struct tlbcam { u32 MAS7; }; #endif + +#if defined(CONFIG_6xx) || defined(CONFIG_FSL_BOOKE) +/* 6xx have BATS */ +/* FSL_BOOKE have TLBCAM */ +phys_addr_t v_block_mapped(unsigned long va); +unsigned long p_block_mapped(phys_addr_t pa); +#else +static inline phys_addr_t v_block_mapped(unsigned long va) { return 0; } +static inline unsigned long p_block_mapped(phys_addr_t pa) { return 0; } +#endif |