Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

+1 -2
+1 -2
arch/parisc/kernel/processor.c
··· 420 420 } 421 421 seq_printf(m, " (0x%02lx)\n", boot_cpu_data.pdc.capabilities); 422 422 423 - seq_printf(m, "model\t\t: %s\n" 424 - "model name\t: %s\n", 423 + seq_printf(m, "model\t\t: %s - %s\n", 425 424 boot_cpu_data.pdc.sys_model_name, 426 425 cpuinfo->dev ? 427 426 cpuinfo->dev->name : "Unknown");