diff options
| author | Helge Deller <deller@gmx.de> | 2022-04-03 21:57:51 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2022-05-08 20:01:11 +0200 |
| commit | 5b89966bc96a06f6ad65f64ae4b0461918fcc9d3 (patch) | |
| tree | da749b46ca25b0ce20da5a509a0d730a433bc440 /arch | |
| parent | parisc: Re-enable GENERIC_CPU_DEVICES for !SMP (diff) | |
| download | linux-5b89966bc96a06f6ad65f64ae4b0461918fcc9d3.tar.xz linux-5b89966bc96a06f6ad65f64ae4b0461918fcc9d3.zip | |
parisc: Merge model and model name into one line in /proc/cpuinfo
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
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 9e92b76b0ce0..26eb568f8b96 100644 --- a/arch/parisc/kernel/processor.c +++ b/arch/parisc/kernel/processor.c @@ -420,8 +420,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"); |