Commit 815b196c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm 

Pull mm hotfixes from Andrew Morton:
 "Fixups for various recently-added and longer-term issues and a few
  minor tweaks:

   - fixes for material merged during this merge window

   - cc:stable fixes for more longstanding issues

   - minor mailmap and MAINTAINERS updates"

* tag 'mm-hotfixes-stable-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  mm/oom_kill.c: fix vm_oom_kill_table[] ifdeffery
  x86/kexec: fix memory leak of elf header buffer
  mm/memremap: fix missing call to untrack_pfn() in pagemap_range()
  mm: page_isolation: use compound_nr() correctly in isolate_single_pageblock()
  mm: hugetlb_vmemmap: fix CONFIG_HUGETLB_PAGE_FREE_VMEMMAP_DEFAULT_ON
  MAINTAINERS: add maintainer information for z3fold
  mailmap: update Josh Poimboeuf's email
parents e17fee89 a19cad06

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -201,6 +201,8 @@ Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org> 
<josh@joshtriplett.org> <josht@linux.vnet.ibm.com>

<josh@joshtriplett.org> <josht@us.ibm.com>

<josh@joshtriplett.org> <josht@vnet.ibm.com>

Josh Poimboeuf <jpoimboe@kernel.org> <jpoimboe@redhat.com>

Josh Poimboeuf <jpoimboe@kernel.org> <jpoimboe@us.ibm.com>

Juha Yrjola <at solidboot.com>

Juha Yrjola <juha.yrjola@nokia.com>

Juha Yrjola <juha.yrjola@solidboot.com>

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -22002,6 +22002,13 @@ L: linux-mm@kvack.org 
S:	Maintained

F:	mm/zbud.c









Z3FOLD COMPRESSED PAGE ALLOCATOR









M:	Vitaly Wool <vitaly.wool@konsulko.com>









R:	Miaohe Lin <linmiaohe@huawei.com>









L:	linux-mm@kvack.org









S:	Maintained









F:	mm/z3fold.c

















ZD1211RW WIRELESS DRIVER









M:	Ulrich Kunitz <kune@deine-taler.de>









L:	linux-wireless@vger.kernel.org

























arch/x86/kernel/machine_kexec_64.c



+9
−3






























Original line number
Diff line number
Diff line







@@ -376,9 +376,6 @@ void machine_kexec(struct kimage *image)







#ifdef CONFIG_KEXEC_FILE









void *arch_kexec_kernel_image_load(struct kimage *image)









{









	vfree(image->elf_headers);









	image->elf_headers = NULL;



















	if (!image->fops || !image->fops->load)









		return ERR_PTR(-ENOEXEC);


















@@ -514,6 +511,15 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi,







	       (int)ELF64_R_TYPE(rel[i].r_info), value);









	return -ENOEXEC;









}



















int arch_kimage_file_post_load_cleanup(struct kimage *image)









{









	vfree(image->elf_headers);









	image->elf_headers = NULL;









	image->elf_headers_sz = 0;



















	return kexec_image_post_load_cleanup_default(image);









}









#endif /* CONFIG_KEXEC_FILE */



















static int
































mm/hugetlb_vmemmap.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -33,7 +33,7 @@ DEFINE_STATIC_KEY_MAYBE(CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON,







EXPORT_SYMBOL(hugetlb_optimize_vmemmap_key);



















static enum vmemmap_optimize_mode vmemmap_optimize_mode =









	IS_ENABLED(CONFIG_HUGETLB_PAGE_FREE_VMEMMAP_DEFAULT_ON);









	IS_ENABLED(CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON);



















static void vmemmap_optimize_mode_switch(enum vmemmap_optimize_mode to)









{
































mm/memremap.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -214,7 +214,7 @@ static int pagemap_range(struct dev_pagemap *pgmap, struct mhp_params *params,

















	if (!mhp_range_allowed(range->start, range_len(range), !is_private)) {









		error = -EINVAL;









		goto err_pfn_remap;









		goto err_kasan;









	}



















	mem_hotplug_begin();