diff options
| author | Philipp Rudo <prudo@linux.ibm.com> | 2020-05-12 19:39:56 +0200 |
|---|---|---|
| committer | Vasily Gorbik <gor@linux.ibm.com> | 2020-05-14 23:21:37 +0200 |
| commit | 70b690547d5ea1a3d135a4cc39cd1e08246d0c3a (patch) | |
| tree | e1de840ec88a5bdd8505853e196f4a8cb060ed0c /arch/s390 | |
| parent | s390/pci: Fix s390_mmio_read/write with MIO (diff) | |
| download | linux-70b690547d5ea1a3d135a4cc39cd1e08246d0c3a.tar.xz linux-70b690547d5ea1a3d135a4cc39cd1e08246d0c3a.zip | |
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: ee337f5469fd ("s390/kexec_file: Add crash support to image loader")
Reported-by: Lianbo Jiang <lijiang@redhat.com>
Signed-off-by: Philipp Rudo <prudo@linux.ibm.com>
Tested-by: Lianbo Jiang <lijiang@redhat.com>
Link: https://lore.kernel.org/r/20200512193956.15ae3f23@laptop2-ibm.local
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/machine_kexec_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/machine_kexec_file.c b/arch/s390/kernel/machine_kexec_file.c index 8415ae7d2a23..f9e4baa64b67 100644 --- a/arch/s390/kernel/machine_kexec_file.c +++ b/arch/s390/kernel/machine_kexec_file.c @@ -151,7 +151,7 @@ static int kexec_file_add_initrd(struct kimage *image, buf.mem += crashk_res.start; buf.memsz = buf.bufsz; - data->parm->initrd_start = buf.mem; + data->parm->initrd_start = data->memsz; data->parm->initrd_size = buf.memsz; data->memsz += buf.memsz; |