From 109ab954713bd07c96f65ceddab4886069a110ab Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Tue, 21 Jun 2016 11:05:05 +0200 Subject: [PATCH] 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 Signed-off-by: Martin Schwidefsky --- arch/s390/kernel/processor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c index 06ca71b7ec0e..6cf24b471b0c 100644 --- a/arch/s390/kernel/processor.c +++ b/arch/s390/kernel/processor.c @@ -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; } -- 2.20.1