diff options
| author | Helge Deller <deller@gmx.de> | 2022-04-03 21:57:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-12 12:14:56 +0200 |
| commit | 74a026832800bb458d2d5f8bce39a51fe399e872 (patch) | |
| tree | 8715c290d5e6b13ea237969323f3531a3b179714 /arch | |
| parent | a2108a3f238a5a60f2874420cfeeb07f60c6bcdd (diff) | |
| download | linux-74a026832800bb458d2d5f8bce39a51fe399e872.tar.gz linux-74a026832800bb458d2d5f8bce39a51fe399e872.tar.bz2 linux-74a026832800bb458d2d5f8bce39a51fe399e872.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/parisc/kernel/processor.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c index 0c2a94a0f751..e31633dcb0f3 100644 --- a/arch/parisc/kernel/processor.c +++ b/arch/parisc/kernel/processor.c @@ -390,8 +390,7 @@ show_cpuinfo (struct seq_file *m, void *v) } seq_printf(m, " (0x%02lx)\n", boot_cpu_data.pdc.capabilities); - seq_printf(m, "model\t\t: %s\n" - "model name\t: %s\n", + seq_printf(m, "model\t\t: %s - %s\n", boot_cpu_data.pdc.sys_model_name, cpuinfo->dev ? cpuinfo->dev->name : "Unknown"); |