parisc: Merge model and model name into one line in /proc/cpuinfo
authorHelge Deller <deller@gmx.de>
Sun, 3 Apr 2022 19:57:51 +0000 (21:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 May 2022 10:30:01 +0000 (12:30 +0200)
commita49454368934bee92f6b35e29ec9cb78dec2a30d
tree275938386a32f16c94d3aa786acd234733305ae6
parentf9a1dbc8b848fda9a8c27acb5b4309f0680aa5ac
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>
arch/parisc/kernel/processor.c