summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm/fsl_booke_mmu.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-01-13 13:59:03 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-01-13 13:59:03 +1100
commit30aae739a9eb6db31ad7b08dac44bd302f41c709 (patch)
treee57a3e279946e141041adc7244d67d8c77c59e2e /arch/powerpc/mm/fsl_booke_mmu.c
parent37a76bd4f1b716949fc38a6842e89f0ccb8384d0 (diff)
parent6fd8be4bf72879b3039654388e985cabf8449af5 (diff)
downloadblackbird-op-linux-30aae739a9eb6db31ad7b08dac44bd302f41c709.tar.gz
blackbird-op-linux-30aae739a9eb6db31ad7b08dac44bd302f41c709.zip
Merge commit 'kumar/kumar-next' into next
Diffstat (limited to 'arch/powerpc/mm/fsl_booke_mmu.c')
-rw-r--r--arch/powerpc/mm/fsl_booke_mmu.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c
index 23cee39534fd..1971e4ee3d6e 100644
--- a/arch/powerpc/mm/fsl_booke_mmu.c
+++ b/arch/powerpc/mm/fsl_booke_mmu.c
@@ -56,18 +56,11 @@
extern void loadcam_entry(unsigned int index);
unsigned int tlbcam_index;
-unsigned int num_tlbcam_entries;
static unsigned long __cam0, __cam1, __cam2;
#define NUM_TLBCAMS (16)
-struct tlbcam {
- u32 MAS0;
- u32 MAS1;
- u32 MAS2;
- u32 MAS3;
- u32 MAS7;
-} TLBCAM[NUM_TLBCAMS];
+struct tlbcam TLBCAM[NUM_TLBCAMS];
struct tlbcamrange {
unsigned long start;
OpenPOWER on IntegriCloud