]> git.karo-electronics.de Git - linux-beck.git/commit
s390/cpuinfo: rename cpu field to cpu number
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Tue, 21 Jun 2016 09:05:05 +0000 (11:05 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Tue, 28 Jun 2016 07:32:26 +0000 (09:32 +0200)
commit109ab954713bd07c96f65ceddab4886069a110ab
tree1546c414636c842647387b52cbb8f31dc4ddf8f4
parent2764196f45be5efe1c9e71bf766ef6291ee86339
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>
arch/s390/kernel/processor.c