arm64: kexec_file: print appropriate variable

[ Upstream commit 51075e0cb759a736e60ab4f3a5fed8670dba5852 ]

The value of kbuf->memsz may be different than kbuf->bufsz after calling
kexec_add_buffer(). Hence both values should be logged.

Fixes: 52b2a8af74360 ("arm64: kexec_file: load initrd and device-tree")
Fixes: 3751e728cef29 ("arm64: kexec_file: add crash dump support")
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
Cc: AKASHI Takahiro <takahiro.akashi@linaro.org>
Cc: James Morse <james.morse@arm.com>
Cc: Bhupesh Sharma <bhsharma@redhat.com>
Link: https://lore.kernel.org/r/20200430163142.27282-2-l.stelmach@samsung.com
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index b40c3b0def920d88c997fb3291318dd634451466..5ebb21b859b4606cb740f1db8b7e9bd2152a19f1 100644 (file)
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -284,7 +284,7 @@ int load_other_segments(struct kimage *image,
                image->arch.elf_headers_sz = headers_sz;
 
                pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-                        image->arch.elf_headers_mem, headers_sz, headers_sz);
+                        image->arch.elf_headers_mem, kbuf.bufsz, kbuf.memsz);
        }
 
        /* load initrd */
@@ -305,7 +305,7 @@ int load_other_segments(struct kimage *image,
                initrd_load_addr = kbuf.mem;
 
                pr_debug("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-                               initrd_load_addr, initrd_len, initrd_len);
+                               initrd_load_addr, kbuf.bufsz, kbuf.memsz);
        }
 
        /* load dtb */
@@ -332,7 +332,7 @@ int load_other_segments(struct kimage *image,
        image->arch.dtb_mem = kbuf.mem;
 
        pr_debug("Loaded dtb at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-                       kbuf.mem, dtb_len, dtb_len);
+                       kbuf.mem, kbuf.bufsz, kbuf.memsz);
 
        return 0;