mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-21 08:19:28 +00:00
Code Issues Releases Wiki Activity

MIPS: Remove probe_tlb().

Browse source 
The function probe_tlb() only does anything for processors that are
not PRID_COMP_LEGACY.  This is precisely the set of processors for
which decode_configs() is called to do identical tlbsize probing
calculations.  Therefore probe_tlb() is completely redundant and may
be removed.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
To: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/865/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
David Daney 2010-01-22 14:41:14 -08:00 committed by Ralf Baechle
parent f868ba2972
commit 2a880986d8
1 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
arch/mips/mm/tlb-r4k.c
View file

@ -447,34 +447,6 @@ __init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
return ret;
}
static void __cpuinit probe_tlb(unsigned long config)
{
struct cpuinfo_mips *c = &current_cpu_data;
unsigned int reg;
/*
* If this isn't a MIPS32 / MIPS64 compliant CPU. Config 1 register
* is not supported, we assume R4k style. Cpu probing already figured
* out the number of tlb entries.
*/
if ((c->processor_id & 0xff0000) == PRID_COMP_LEGACY)
return;
#ifdef CONFIG_MIPS_MT_SMTC
/*
* If TLB is shared in SMTC system, total size already
* has been calculated and written into cpu_data tlbsize
*/
if((smtc_status & SMTC_TLB_SHARED) == SMTC_TLB_SHARED)
return;
#endif /* CONFIG_MIPS_MT_SMTC */
reg = read_c0_config1();
if (!((config >> 7) & 3))
panic("No TLB present");
c->tlbsize = ((reg >> 25) & 0x3f) + 1;
}
static int __cpuinitdata ntlb;
static int __init set_ntlb(char *str)
{
@ -486,8 +458,6 @@ __setup("ntlb=", set_ntlb);
void __cpuinit tlb_init(void)
{
unsigned int config = read_c0_config();
/*
* You should never change this register:
* - On R4600 1.7 the tlbp never hits for pages smaller than
@ -495,7 +465,6 @@ void __cpuinit tlb_init(void)
* - The entire mm handling assumes the c0_pagemask register to
* be set to fixed-size pages.
*/
probe_tlb(config);
write_c0_pagemask(PM_DEFAULT_MASK);
write_c0_wired(0);
if (current_cpu_type() == CPU_R10000 ||