forked from luck/tmp_suning_uos_patched
a196f277c5
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> |
||
|---|---|---|
| .. | ||
| syscalls | ||
| .gitignore | ||
| alternative.c | ||
| asm-offsets.c | ||
| audit.c | ||
| cache.c | ||
| compat_audit.c | ||
| drivers.c | ||
| entry.S | ||
| firmware.c | ||
| ftrace.c | ||
| hardware.c | ||
| head.S | ||
| hpmc.S | ||
| inventory.c | ||
| irq.c | ||
| jump_label.c | ||
| kexec_file.c | ||
| kexec.c | ||
| kgdb.c | ||
| kprobes.c | ||
| Makefile | ||
| module.c | ||
| pa7300lc.c | ||
| pacache.S | ||
| parisc_ksyms.c | ||
| patch.c | ||
| pci-dma.c | ||
| pci.c | ||
| pdc_chassis.c | ||
| pdc_cons.c | ||
| pdt.c | ||
| perf_asm.S | ||
| perf_images.h | ||
| perf.c | ||
| process.c | ||
| processor.c | ||
| ptrace.c | ||
| real2.S | ||
| relocate_kernel.S | ||
| setup.c | ||
| signal.c | ||
| signal32.c | ||
| signal32.h | ||
| smp.c | ||
| stacktrace.c | ||
| sys_parisc.c | ||
| sys_parisc32.c | ||
| syscall.S | ||
| time.c | ||
| topology.c | ||
| traps.c | ||
| unaligned.c | ||
| unwind.c | ||
| vmlinux.lds.S | ||