mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
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>
This commit is contained in:
parent
4194318c39
commit
b382fe8483
1 changed files with 4 additions and 4 deletions
|
@ -509,8 +509,7 @@ static inline void decode_configs(struct cpuinfo_mips *c)
|
||||||
static inline void cpu_probe_mips(struct cpuinfo_mips *c)
|
static inline void cpu_probe_mips(struct cpuinfo_mips *c)
|
||||||
{
|
{
|
||||||
decode_configs(c);
|
decode_configs(c);
|
||||||
if (cpu_has_tlb)
|
c->options |= MIPS_CPU_4KTLB;
|
||||||
c->options |= MIPS_CPU_4KTLB;
|
|
||||||
switch (c->processor_id & 0xff00) {
|
switch (c->processor_id & 0xff00) {
|
||||||
case PRID_IMP_4KC:
|
case PRID_IMP_4KC:
|
||||||
c->cputype = CPU_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)
|
static inline void cpu_probe_alchemy(struct cpuinfo_mips *c)
|
||||||
{
|
{
|
||||||
decode_configs(c);
|
decode_configs(c);
|
||||||
|
c->options |= MIPS_CPU_4KTLB;
|
||||||
switch (c->processor_id & 0xff00) {
|
switch (c->processor_id & 0xff00) {
|
||||||
case PRID_IMP_AU1_REV1:
|
case PRID_IMP_AU1_REV1:
|
||||||
case PRID_IMP_AU1_REV2:
|
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)
|
static inline void cpu_probe_sibyte(struct cpuinfo_mips *c)
|
||||||
{
|
{
|
||||||
decode_configs(c);
|
decode_configs(c);
|
||||||
|
c->options |= MIPS_CPU_4KTLB;
|
||||||
switch (c->processor_id & 0xff00) {
|
switch (c->processor_id & 0xff00) {
|
||||||
case PRID_IMP_SB1:
|
case PRID_IMP_SB1:
|
||||||
c->cputype = CPU_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)
|
static inline void cpu_probe_sandcraft(struct cpuinfo_mips *c)
|
||||||
{
|
{
|
||||||
decode_configs(c);
|
decode_configs(c);
|
||||||
if (cpu_has_tlb)
|
c->options |= MIPS_CPU_4KTLB;
|
||||||
c->options |= MIPS_CPU_4KTLB;
|
|
||||||
switch (c->processor_id & 0xff00) {
|
switch (c->processor_id & 0xff00) {
|
||||||
case PRID_IMP_SR71000:
|
case PRID_IMP_SR71000:
|
||||||
c->cputype = CPU_SR71000;
|
c->cputype = CPU_SR71000;
|
||||||
|
|
Loading…
Reference in a new issue