| commit | a196f277c547066a185d7760c08c65a099d815ed | [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:25:29 2022 +0200 |
| tree | d5390d00eca49161bdb39e60912ade16d4e44f4b | |
| parent | 326f02f172d08b959da035f69e93e6afdf91745c [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>