]> git.baikalelectronics.ru Git - kernel.git/commit
MIPS: Fix MIPS I ISA /proc/cpuinfo reporting
authorMaciej W. Rozycki <macro@linux-mips.org>
Sat, 8 Jul 2017 22:24:44 +0000 (23:24 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 11 Jul 2017 12:13:50 +0000 (14:13 +0200)
commitf70a1592d27cf8d93363f0a4c21f997e119d4d25
tree10e5c9d3f4952edd00f97b948e73b74807dbc1e1
parentae682c9fae873f823a1ed43665b9da93eb1d9526
MIPS: Fix MIPS I ISA /proc/cpuinfo reporting

Correct a commit cbe588b6a343 ("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: cbe588b6a343 ("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
Cc: stable@vger.kernel.org # 3.19+
Patchwork: https://patchwork.linux-mips.org/patch/16758/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/kernel/proc.c