Commit 109ab954 authored Jun 21, 2016 by Heiko Carstens Committed by Martin Schwidefsky Jun 28, 2016

s390/cpuinfo: rename cpu field to cpu number



The cpu field name within /proc/cpuinfo has a conflict with the
powerpc and sparc output where it contains the cpu model name.  So
rename the field name to cpu number which shouldn't generate any
conflicts.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

parent 2764196f

arch/s390/kernel/processor.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -143,7 +143,7 @@ static int show_cpuinfo(struct seq_file m, void v)
		show_cpu_summary(m, v);
		if (!machine_has_cpu_mhz)
		return 0;
		seq_printf(m, "\ncpu : %ld\n", n);
		seq_printf(m, "\ncpu number : %ld\n", n);
		show_cpu_mhz(m, n);
		return 0;
		}