From cf0ba886906c01077f4d9fb1efc3ec10d52afa52 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 6 May 2005 14:31:13 +0000 Subject: [PATCH] --- yaml --- r: 11081 b: refs/heads/master c: b382fe848345fe626b74a559fa89d2d966d03b02 h: refs/heads/master i: 11079: f885b9ed90b58f9fb6ce50c52a30307227822662 v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/cpu-probe.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5237bd9f44c8..2c0803bd3c00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4194318c3941fa9cfaa63dfdab9054fcae5e08d3 +refs/heads/master: b382fe848345fe626b74a559fa89d2d966d03b02 diff --git a/trunk/arch/mips/kernel/cpu-probe.c b/trunk/arch/mips/kernel/cpu-probe.c index ba2dbc266d51..cde88285a52f 100644 --- a/trunk/arch/mips/kernel/cpu-probe.c +++ b/trunk/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;