Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fd8be4b authored by Trent Piepho's avatar Trent Piepho Committed by Kumar Gala
Browse files

powerpc/fsl-booke: Remove num_tlbcam_entries 



This is a global variable defined in fsl_booke_mmu.c with a value that gets
initialized in assembly code in head_fsl_booke.S.

It's never used.

If some code ever does want to know the number of entries in TLB1, then
"numcams = mfspr(SPRN_TLB1CFG) & 0xfff", is a whole lot simpler than a
global initialized during kernel boot from assembly.

Signed-off-by: default avatarTrent Piepho <tpiepho@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 19f5465e

arch/powerpc/kernel/head_fsl_booke.S

+0 −4
Original line number Diff line number Diff line
@@ -389,10 +389,6 @@ skpinv: addi r6,r6,1 /* Increment */ 
#endif

#endif



	mfspr	r3,SPRN_TLB1CFG

	andi.	r3,r3,0xfff

	lis	r4,num_tlbcam_entries@ha

	stw	r3,num_tlbcam_entries@l(r4)

/*

 * Decide what sort of machine this is and initialize the MMU.

 */

arch/powerpc/mm/fsl_booke_mmu.c

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ 


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)

arch/powerpc/mm/mmu_decl.h

+0 −2
Original line number Diff line number Diff line
@@ -99,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;