Commit bc9950b5 authored by Andrew Morton's avatar Andrew Morton
Browse files

Merge branch 'mm-hotfixes-stable' into mm-stable in order to pick up 

changes required by mm-stable material: hugetlb and damon.
parents 103e9062 ce4be9e4

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -16127,6 +16127,7 @@ M: Andrew Morton <akpm@linux-foundation.org> 
M:	Mike Rapoport <rppt@kernel.org>

L:	linux-mm@kvack.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git

F:	include/linux/numa_memblks.h

F:	mm/numa.c

F:	mm/numa_emulation.c
@@ -16194,6 +16195,7 @@ R: Rik van Riel <riel@surriel.com> 
R:	Liam R. Howlett <Liam.Howlett@oracle.com>

R:	Vlastimil Babka <vbabka@suse.cz>

R:	Harry Yoo <harry.yoo@oracle.com>

R:	Jann Horn <jannh@google.com>

L:	linux-mm@kvack.org

S:	Maintained

F:	include/linux/rmap.h
@@ -16239,6 +16241,7 @@ R: Nico Pache <npache@redhat.com> 
R:	Ryan Roberts <ryan.roberts@arm.com>

R:	Dev Jain <dev.jain@arm.com>

R:	Barry Song <baohua@kernel.org>

R:	Lance Yang <lance.yang@linux.dev>

L:	linux-mm@kvack.org

S:	Maintained

W:	http://www.linux-mm.org

arch/arm64/kernel/machine_kexec_file.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ int load_other_segments(struct kimage *image, 
			char *initrd, unsigned long initrd_len,

			char *cmdline)

{

	struct kexec_buf kbuf;

	struct kexec_buf kbuf = {};

	void *dtb = NULL;

	unsigned long initrd_load_addr = 0, dtb_len,

		      orig_segments = image->nr_segments;

arch/riscv/kernel/kexec_elf.c

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static int riscv_kexec_elf_load(struct kimage *image, struct elfhdr *ehdr, 
	int i;

	int ret = 0;

	size_t size;

	struct kexec_buf kbuf;

	struct kexec_buf kbuf = {};

	const struct elf_phdr *phdr;



	kbuf.image = image;
@@ -66,7 +66,7 @@ static int elf_find_pbase(struct kimage *image, unsigned long kernel_len, 
{

	int i;

	int ret;

	struct kexec_buf kbuf;

	struct kexec_buf kbuf = {};

	const struct elf_phdr *phdr;

	unsigned long lowest_paddr = ULONG_MAX;

	unsigned long lowest_vaddr = ULONG_MAX;

arch/riscv/kernel/kexec_image.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static void *image_load(struct kimage *image, 
	struct riscv_image_header *h;

	u64 flags;

	bool be_image, be_kernel;

	struct kexec_buf kbuf;

	struct kexec_buf kbuf = {};

	int ret;



	/* Check Image header */

arch/riscv/kernel/machine_kexec_file.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ int load_extra_segments(struct kimage *image, unsigned long kernel_start, 
	int ret;

	void *fdt;

	unsigned long initrd_pbase = 0UL;

	struct kexec_buf kbuf;

	struct kexec_buf kbuf = {};

	char *modified_cmdline = NULL;



	kbuf.image = image;