diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-13 03:59:03 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-13 03:59:03 +0100 |
| commit | 30aae739a9eb6db31ad7b08dac44bd302f41c709 (patch) | |
| tree | e57a3e279946e141041adc7244d67d8c77c59e2e /arch/powerpc/mm/mmu_decl.h | |
| parent | async: fix __lowest_in_progress() (diff) | |
| parent | powerpc/fsl-booke: Remove num_tlbcam_entries (diff) | |
| download | linux-30aae739a9eb6db31ad7b08dac44bd302f41c709.tar.xz linux-30aae739a9eb6db31ad7b08dac44bd302f41c709.zip | |
Merge commit 'kumar/kumar-next' into next
Diffstat (limited to 'arch/powerpc/mm/mmu_decl.h')
| -rw-r--r-- | arch/powerpc/mm/mmu_decl.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h index ad123bced404..d1f9c62dc177 100644 --- a/arch/powerpc/mm/mmu_decl.h +++ b/arch/powerpc/mm/mmu_decl.h @@ -75,6 +75,15 @@ extern void _tlbia(void); #endif /* CONFIG_PPC_MMU_NOHASH */ #ifdef CONFIG_PPC32 + +struct tlbcam { + u32 MAS0; + u32 MAS1; + u32 MAS2; + u32 MAS3; + u32 MAS7; +}; + 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, @@ -90,8 +99,6 @@ extern unsigned int rtas_data, rtas_size; struct hash_pte; extern struct hash_pte *Hash, *Hash_end; extern unsigned long Hash_size, Hash_mask; - -extern unsigned int num_tlbcam_entries; #endif extern unsigned long ioremap_bot; |