소스 검색

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>
Heiko Carstens 9 년 전
부모
커밋
109ab95471
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      arch/s390/kernel/processor.c

+ 1 - 1
arch/s390/kernel/processor.c

@@ -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;
 }
 }