diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2016-06-21 11:05:05 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-06-28 09:32:26 +0200 |
| commit | 109ab954713bd07c96f65ceddab4886069a110ab (patch) | |
| tree | 1546c414636c842647387b52cbb8f31dc4ddf8f4 /arch | |
| parent | 2764196f45be5efe1c9e71bf766ef6291ee86339 (diff) | |
| download | linux-109ab954713bd07c96f65ceddab4886069a110ab.tar.gz linux-109ab954713bd07c96f65ceddab4886069a110ab.tar.bz2 linux-109ab954713bd07c96f65ceddab4886069a110ab.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/kernel/processor.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |