Skip to contentSkip to conversation

x86-crash-remove-the-unused-image-parameter-from-prepare_elf_headers.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Jan 5, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: x86/crash: remove the unused image parameter from prepare_elf_headers()
has been removed from the -mm tree. Its filename was
x86-crash-remove-the-unused-image-parameter-from-prepare_elf_headers.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Yuntao Wang <[email protected]>
Subject: x86/crash: remove the unused image parameter from prepare_elf_headers()
Date: Tue, 2 Jan 2024 22:49:03 +0800

Patch series "crash: Some cleanups and fixes", v2.

This patchset includes two cleanups and one fix.

This patch (of 3):

The image parameter is no longer in use, remove it. Also, tidy up the code formatting.

---

 arch/x86/kernel/crash.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/kernel/crash.c renamed from arch/x86/kernel/crash.c~x86-crash-remove-the-unused-image-parameter-from-prepare_elf_headers +5 -5
@@ -198,8 +198,8 @@ static int prepare_elf64_ram_headers_cal
 }
 
 /* Prepare elf headers. Return addr and size */
-static int prepare_elf_headers(struct kimage *image, void **addr,
-					unsigned long *sz, unsigned long *nr_mem_ranges)
+static int prepare_elf_headers(void **addr, unsigned long *sz,
+			       unsigned long *nr_mem_ranges)
 {
 	struct crash_mem *cmem;
 	int ret;
@@ -221,7 +221,7 @@ static int prepare_elf_headers(struct ki
 	*nr_mem_ranges = cmem->nr_ranges;
 
 	/* By default prepare 64bit headers */
-	ret =  crash_prepare_elf64_headers(cmem, IS_ENABLED(CONFIG_X86_64), addr, sz);
+	ret = crash_prepare_elf64_headers(cmem, IS_ENABLED(CONFIG_X86_64), addr, sz);
 
 out:
 	vfree(cmem);
@@ -349,7 +349,7 @@ int crash_load_segments(struct kimage *i
 				  .buf_max = ULONG_MAX, .top_down = false };
 
 	/* Prepare elf headers and add a segment */
-	ret = prepare_elf_headers(image, &kbuf.buffer, &kbuf.bufsz, &pnum);
+	ret = prepare_elf_headers(&kbuf.buffer, &kbuf.bufsz, &pnum);
 	if (ret)
 		return ret;
 
@@ -452,7 +452,7 @@ void arch_crash_handle_hotplug_event(str
 	 * Create the new elfcorehdr reflecting the changes to CPU and/or
 	 * memory resources.
 	 */
-	if (prepare_elf_headers(image, &elfbuf, &elfsz, &nr_mem_ranges)) {
+	if (prepare_elf_headers(&elfbuf, &elfsz, &nr_mem_ranges)) {
 		pr_err("unable to create new elfcorehdr");
 		goto out;
 	}

_

Patches currently in -mm which might be from [email protected] are