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>

diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c
index 06ca71b7ec0e6a8e35054ee67a5e40f0e4fe13a7..6cf24b471b0c5b50d9bf54960a65b8443a3e1399 100644 (file)
--- 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;
 }