diff options
| author | Alexander Egorenkov <egorenar@linux.ibm.com> | 2021-06-15 15:15:07 +0300 |
|---|---|---|
| committer | Heiko Carstens <hca@linux.ibm.com> | 2021-07-27 10:39:15 +0300 |
| commit | 84733284f67b1a937f6205fdb16aa5cbb8b4f53d (patch) | |
| tree | 4d271615ac8c5e35ec7976f01e0722472f47b2d6 /arch/s390/boot/ipl_report.c | |
| parent | f1d3c5323772a215d910aeaf697d210a3671cf81 (diff) | |
| download | linux-84733284f67b1a937f6205fdb16aa5cbb8b4f53d.tar.xz | |
s390/boot: introduce boot data 'initrd_data'
The new boot data struct shall replace global variables INITRD_START and
INITRD_SIZE. It is initialized in the decompressor and passed
to the decompressed kernel. In comparison to the old solution, this one
doesn't access data at fixed physical addresses which will become important
when the decompressor becomes relocatable.
Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch/s390/boot/ipl_report.c')
| -rw-r--r-- | arch/s390/boot/ipl_report.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/boot/ipl_report.c b/arch/s390/boot/ipl_report.c index 0b4965573656..9b14045065b6 100644 --- a/arch/s390/boot/ipl_report.c +++ b/arch/s390/boot/ipl_report.c @@ -54,9 +54,9 @@ static unsigned long find_bootdata_space(struct ipl_rb_components *comps, * not overlap with any component or any certificate. */ repeat: - if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && INITRD_START && INITRD_SIZE && - intersects(INITRD_START, INITRD_SIZE, safe_addr, size)) - safe_addr = INITRD_START + INITRD_SIZE; + if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && initrd_data.start && initrd_data.size && + intersects(initrd_data.start, initrd_data.size, safe_addr, size)) + safe_addr = initrd_data.start + initrd_data.size; for_each_rb_entry(comp, comps) if (intersects(safe_addr, size, comp->addr, comp->len)) { safe_addr = comp->addr + comp->len; |