diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2005-05-06 14:31:13 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 19:31:13 +0100 |
| commit | b382fe848345fe626b74a559fa89d2d966d03b02 (patch) | |
| tree | 37218490821a823b85424c7718d18c6910c8a7f3 | |
| parent | 4194318c3941fa9cfaa63dfdab9054fcae5e08d3 (diff) | |
No point in checking cpu_has_tlb before we've computed the CPU options.
So for now we just unconditionally set the option - Linux wouldn't
work without a TLB anyway.
Setting MIPS_CPU_4KTLB was missing for Alchemy and Sandcraft, add that
back.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/kernel/cpu-probe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index ba2dbc266d51..cde88285a52f 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -509,8 +509,7 @@ static inline void decode_configs(struct cpuinfo_mips *c) static inline void cpu_probe_mips(struct cpuinfo_mips *c) { decode_configs(c); - if (cpu_has_tlb) - c->options |= MIPS_CPU_4KTLB; + c->options |= MIPS_CPU_4KTLB; switch (c->processor_id & 0xff00) { case PRID_IMP_4KC: c->cputype = CPU_4KC; @@ -544,6 +543,7 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c) static inline void cpu_probe_alchemy(struct cpuinfo_mips *c) { decode_configs(c); + c->options |= MIPS_CPU_4KTLB; switch (c->processor_id & 0xff00) { case PRID_IMP_AU1_REV1: case PRID_IMP_AU1_REV2: @@ -574,6 +574,7 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c) static inline void cpu_probe_sibyte(struct cpuinfo_mips *c) { decode_configs(c); + c->options |= MIPS_CPU_4KTLB; switch (c->processor_id & 0xff00) { case PRID_IMP_SB1: c->cputype = CPU_SB1; @@ -588,8 +589,7 @@ static inline void cpu_probe_sibyte(struct cpuinfo_mips *c) static inline void cpu_probe_sandcraft(struct cpuinfo_mips *c) { decode_configs(c); - if (cpu_has_tlb) - c->options |= MIPS_CPU_4KTLB; + c->options |= MIPS_CPU_4KTLB; switch (c->processor_id & 0xff00) { case PRID_IMP_SR71000: c->cputype = CPU_SR71000; |