]> git.proxmox.com Git - mirror_ubuntu-eoan-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)
commitf3df44e7c9869b7691a4a0b57fa39ca47060b424
treea4502b0b9b9581d297be69902646b7afbd349559
parentf6780686525cc69a16a893cac0dd6adfbf25b7ff
s390/zcore: Rename ipl_block to mitigate name collision

With git commit 1e941d39493f1820475d80729a03cd7ab8c3c86d
"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: 1e941d39493f ("s390: move ipl block to .boot.preserved.data section")
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/char/zcore.c