Skip to contentSkip to conversation

kexec-replace-crash_mem_range-with-range.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Nov 15, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: kexec: replace crash_mem_range with range
has been removed from the -mm tree. Its filename was
kexec-replace-crash_mem_range-with-range.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: Li Chen <[email protected]>
Subject: kexec: replace crash_mem_range with range
Date: Thu, 29 Sep 2022 12:29:35 +0800

We already have struct range, so just use it.

Cc Michael Ellerman <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Chen Lifu <[email protected]>
Cc "Eric W . Biederman" <[email protected]>
Cc Jianglei Nie <[email protected]>
Cc Petr Mladek <[email protected]>
Cc Russell King <[email protected]>
Cc ye xingchen <[email protected]>
Cc Zeal Robot <[email protected]>

---

 arch/powerpc/kexec/file_load_64.c |    2 +-
 arch/powerpc/kexec/ranges.c       |    8 ++++----
 include/linux/kexec.h             |    7 ++-----
 kernel/kexec_file.c               |    2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)
arch/powerpc/kexec/file_load_64.c renamed from arch/powerpc/kexec/file_load_64.c~kexec-replace-crash_mem_range-with-range +1 -1
@@ -35,7 +35,7 @@ struct umem_info {
 
 	/* usable memory ranges to look up */
 	unsigned int nr_ranges;
-	const struct crash_mem_range *ranges;
+	const struct range *ranges;
 };
 
 const struct kexec_file_ops * const kexec_file_loaders[] = {
arch/powerpc/kexec/ranges.c renamed from arch/powerpc/kexec/ranges.c~kexec-replace-crash_mem_range-with-range +4 -4
@@ -33,7 +33,7 @@
 static inline unsigned int get_max_nr_ranges(size_t size)
 {
 	return ((size - sizeof(struct crash_mem)) /
-		sizeof(struct crash_mem_range));
+		sizeof(struct range));
 }
 
 /**
@@ -51,7 +51,7 @@ static inline size_t get_mem_rngs_size(s
 		return 0;
 
 	size = (sizeof(struct crash_mem) +
-		(mem_rngs->max_nr_ranges * sizeof(struct crash_mem_range)));
+		(mem_rngs->max_nr_ranges * sizeof(struct range)));
 
 	/*
 	 * Memory is allocated in size multiple of MEM_RANGE_CHUNK_SZ.
@@ -98,7 +98,7 @@ static int __add_mem_range(struct crash_
  */
 static void __merge_memory_ranges(struct crash_mem *mem_rngs)
 {
-	struct crash_mem_range *ranges;
+	struct range *ranges;
 	int i, idx;
 
 	if (!mem_rngs)
@@ -123,7 +123,7 @@ static void __merge_memory_ranges(struct
 /* cmp_func_t callback to sort ranges with sort() */
 static int rngcmp(const void *_x, const void *_y)
 {
-	const struct crash_mem_range *x = _x, *y = _y;
+	const struct range *x = _x, *y = _y;
 
 	if (x->start > y->start)
 		return 1;
include/linux/kexec.h renamed from include/linux/kexec.h~kexec-replace-crash_mem_range-with-range +2 -5
@@ -17,6 +17,7 @@
 
 #include <linux/crash_core.h>
 #include <asm/io.h>
+#include <linux/range.h>
 
 #include <uapi/linux/kexec.h>
 #include <linux/verification.h>
@@ -240,14 +241,10 @@ static inline int arch_kexec_locate_mem_
 /* Alignment required for elf header segment */
 #define ELF_CORE_HEADER_ALIGN   4096
 
-struct crash_mem_range {
-	u64 start, end;
-};
-
 struct crash_mem {
 	unsigned int max_nr_ranges;
 	unsigned int nr_ranges;
-	struct crash_mem_range ranges[];
+	struct range ranges[];
 };
 
 extern int crash_exclude_mem_range(struct crash_mem *mem,
kernel/kexec_file.c renamed from kernel/kexec_file.c~kexec-replace-crash_mem_range-with-range +1 -1
@@ -1141,7 +1141,7 @@ int crash_exclude_mem_range(struct crash
 {
 	int i, j;
 	unsigned long long start, end, p_start, p_end;
-	struct crash_mem_range temp_range = {0, 0};
+	struct range temp_range = {0, 0};
 
 	for (i = 0; i < mem->nr_ranges; i++) {
 		start = mem->ranges[i].start;

_

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