Skip to content

Commit

Permalink
s390/boot: do not check for zero-termination relocation entry
Browse files Browse the repository at this point in the history
The relocation table is not expected to contain a zero-termination
entry. The existing check is likely a left-over from similar x86
code that uses zero-entries as delimiters. s390 does not have ones
and therefore the check could be avoided.

Suggested-by: Ilya Leoshkevich <iii@linux.ibm.com>
Acked-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
  • Loading branch information
Alexander Gordeev authored and Heiko Carstens committed Feb 26, 2024
1 parent 4394a50 commit 923d48e
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions arch/s390/boot/startup.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,7 @@ static void kaslr_adjust_relocs(unsigned long min_addr, unsigned long max_addr,
long loc;

/* Adjust R_390_64 relocations */
for (reloc = vmlinux_relocs_64_start;
reloc < vmlinux_relocs_64_end && *reloc;
reloc++) {
for (reloc = vmlinux_relocs_64_start; reloc < vmlinux_relocs_64_end; reloc++) {
loc = (long)*reloc + offset;
if (loc < min_addr || loc > max_addr)
error("64-bit relocation outside of kernel!\n");
Expand Down

0 comments on commit 923d48e

Please sign in to comment.