| commit | 74a026832800bb458d2d5f8bce39a51fe399e872 | [log] [tgz] |
|---|---|---|
| author | Helge Deller <deller@gmx.de> | Sun Apr 03 21:57:51 2022 +0200 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Thu May 12 12:14:56 2022 +0200 |
| tree | 8715c290d5e6b13ea237969323f3531a3b179714 | |
| parent | a2108a3f238a5a60f2874420cfeeb07f60c6bcdd [diff] |
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>