tree 8715c290d5e6b13ea237969323f3531a3b179714
parent a2108a3f238a5a60f2874420cfeeb07f60c6bcdd
author Helge Deller <deller@gmx.de> 1649015871 +0200
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1652350496 +0200

parisc: Merge model and model name into one line in /proc/cpuinfo

commit 5b89966bc96a06f6ad65f64ae4b0461918fcc9d3 upstream.

The Linux tool "lscpu" shows the double amount of CPUs if we have
"model" and "model name" in two different lines in /proc/cpuinfo.
This change combines the model and the model name into one line.

Signed-off-by: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>