CVS Update@linux-mips.org: linux

[ralf@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/05/06 15:31:13

Modified files:
        arch/mips/kernel: cpu-probe.c 

Log message:
        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.

diff -urN linux/arch/mips/kernel/cpu-probe.c linux/arch/mips/kernel/cpu-probe.c
--- linux/arch/mips/kernel/cpu-probe.c  2005/05/05 16:45:59     1.45
+++ linux/arch/mips/kernel/cpu-probe.c  2005/05/06 14:31:13     1.46
@@ -515,8 +515,7 @@
 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;
@@ -550,6 +549,7 @@
 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:
@@ -580,6 +580,7 @@
 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;
@@ -594,8 +595,7 @@
 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;