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

Commit b382fe84 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

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: default avatarRalf Baechle <ralf@linux-mips.org>
parent 4194318c

arch/mips/kernel/cpu-probe.c

+4 −4
Original line number Diff line number Diff line
@@ -509,7 +509,6 @@ 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;

	switch (c->processor_id & 0xff00) {

	case PRID_IMP_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,7 +589,6 @@ 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;

	switch (c->processor_id & 0xff00) {

	case PRID_IMP_SR71000: