]> git.baikalelectronics.ru Git - kernel.git/commit
s390/zcore: Rename ipl_block to mitigate name collision
authorPhilipp Rudo <prudo@linux.ibm.com>
Thu, 14 Mar 2019 12:50:32 +0000 (13:50 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Fri, 26 Apr 2019 10:34:05 +0000 (12:34 +0200)
commitf472825b8b2750b12eac48373b2d986eeaf3ea94
treea4502b0b9b9581d297be69902646b7afbd349559
parente3ddbc840d4b00e98b9776d27e343873fc9cbc55
s390/zcore: Rename ipl_block to mitigate name collision

With git commit 10c2f9d879f915a1f1301dddfa3ce507e1f158f3
"s390: move ipl block to .boot.preserved.data section" the earl_ipl_block
got renamed to ipl_block and became publicly available via boot_data.h.
This might cause problems with zcore, which has it's own ipl_block
variable. Thus rename the ipl_block in zcore to prevent name collision
and highlight that it's only used locally.

Signed-off-by: Philipp Rudo <prudo@linux.ibm.com>
Fixes: 10c2f9d879f9 ("s390: move ipl block to .boot.preserved.data section")
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/char/zcore.c