Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8b7cc4b authored by Helge Deller's avatar Helge Deller Committed by Greg Kroah-Hartman
Browse files

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: default avatarHelge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 47f1b566

arch/parisc/kernel/processor.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -423,8 +423,7 @@ show_cpuinfo (struct seq_file *m, void *v) 
		}

		}

		seq_printf(m, " (0x%02lx)\n", boot_cpu_data.pdc.capabilities);

		seq_printf(m, " (0x%02lx)\n", boot_cpu_data.pdc.capabilities);





		seq_printf(m, "model\t\t: %s\n"

		seq_printf(m, "model\t\t: %s - %s\n",

				"model name\t: %s\n",

				 boot_cpu_data.pdc.sys_model_name,

				 boot_cpu_data.pdc.sys_model_name,

				 cpuinfo->dev ?

				 cpuinfo->dev ?

				 cpuinfo->dev->name : "Unknown");

				 cpuinfo->dev->name : "Unknown");