Skip to content

Commit 70b6905

Browse files
Philipp RudoVasily Gorbik
authored andcommitted
s390/kexec_file: fix initrd location for kdump kernel
initrd_start must not point at the location the initrd is loaded into the crashkernel memory but at the location it will be after the crashkernel memory is swapped with the memory at 0. Fixes: ee337f5 ("s390/kexec_file: Add crash support to image loader") Reported-by: Lianbo Jiang <[email protected]> Signed-off-by: Philipp Rudo <[email protected]> Tested-by: Lianbo Jiang <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Christian Borntraeger <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent f058599 commit 70b6905

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/s390/kernel/machine_kexec_file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ static int kexec_file_add_initrd(struct kimage *image,
151151
buf.mem += crashk_res.start;
152152
buf.memsz = buf.bufsz;
153153

154-
data->parm->initrd_start = buf.mem;
154+
data->parm->initrd_start = data->memsz;
155155
data->parm->initrd_size = buf.memsz;
156156
data->memsz += buf.memsz;
157157

0 commit comments

Comments
 (0)