Commit 109ab954 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky

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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 2764196f
...@@ -143,7 +143,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) ...@@ -143,7 +143,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
show_cpu_summary(m, v); show_cpu_summary(m, v);
if (!machine_has_cpu_mhz) if (!machine_has_cpu_mhz)
return 0; return 0;
seq_printf(m, "\ncpu : %ld\n", n); seq_printf(m, "\ncpu number : %ld\n", n);
show_cpu_mhz(m, n); show_cpu_mhz(m, n);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment