Skip to content

Commit a0ee412

Browse files
Maciej W. Rozyckigregkh
authored andcommitted
MIPS: Fix MIPS I ISA /proc/cpuinfo reporting
commit e5f5a5b06e51a36f6ddf31a4a485358263953a3d upstream. Correct a commit 515a639 ("MIPS: kernel: proc: Add MIPS R6 support to /proc/cpuinfo") regression that caused MIPS I systems to show no ISA levels supported in /proc/cpuinfo, e.g.: system type : Digital DECstation 2100/3100 machine : Unknown processor : 0 cpu model : R3000 V2.0 FPU V2.0 BogoMIPS : 10.69 wait instruction : no microsecond timers : no tlb_entries : 64 extra interrupt vector : no hardware watchpoint : no isa : ASEs implemented : shadow register sets : 1 kscratch registers : 0 package : 0 core : 0 VCED exceptions : not available VCEI exceptions : not available and similarly exclude `mips1' from the ISA list for any processors below MIPSr1. This is because the condition to show `mips1' on has been made `cpu_has_mips_r1' rather than newly-introduced `cpu_has_mips_1'. Use the correct condition then. Fixes: 515a639 ("MIPS: kernel: proc: Add MIPS R6 support to /proc/cpuinfo") Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Reviewed-by: James Hogan <james.hogan@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/16758/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 71de40f commit a0ee412

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/mips/kernel/proc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
8383
}
8484

8585
seq_printf(m, "isa\t\t\t:");
86-
if (cpu_has_mips_r1)
86+
if (cpu_has_mips_1)
8787
seq_printf(m, " mips1");
8888
if (cpu_has_mips_2)
8989
seq_printf(m, "%s", " mips2");

0 commit comments

Comments
 (0)