Commit 7c902e27 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misx fixes from Andrew Morton:
 "31 patches.

  Subsystems affected by this patch series: hotfixes, mm/pagealloc,
  kexec, ocfs2, lib, mm/slab, mm/slab, mm/slub, mm/swap, mm/pagemap,
  mm/vmalloc, mm/memcg, mm/gup, mm/thp, mm/vmscan, x86,
  mm/memory-hotplug, MAINTAINERS"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (31 commits)
  MAINTAINERS: update info for sparse
  mm/memory_hotplug.c: fix false softlockup during pfn range removal
  mm: remove vmalloc_exec
  arm64: use PAGE_KERNEL_ROX directly in alloc_insn_page
  x86/hyperv: allocate the hypercall page with only read and execute bits
  mm/memory: fix IO cost for anonymous page
  mm/swap: fix for "mm: workingset: age nonresident information alongside anonymous pages"
  mm: workingset: age nonresident information alongside anonymous pages
  doc: THP CoW fault no longer allocate THP
  docs: mm/gup: minor documentation update
  mm/memcontrol.c: prevent missed memory.low load tears
  mm/memcontrol.c: add missed css_put()
  mm: memcontrol: handle div0 crash race condition in memory.low
  mm/vmalloc.c: fix a warning while make xmldocs
  media: omap3isp: remove cacheflush.h
  make asm-generic/cacheflush.h more standalone
  mm/debug_vm_pgtable: fix build failure with powerpc 8xx
  mm/memory.c: properly pte_offset_map_lock/unlock in vm_insert_pages()
  mm: fix swap cache node allocation mask
  slub: cure list_slab_objects() from double fix
  ...
parents 4a21185c 19ef1f9d

Documentation/admin-guide/cgroup-v2.rst

+2 −2
Original line number Diff line number Diff line
@@ -1356,8 +1356,8 @@ PAGE_SIZE multiple when read back. 


	  thp_fault_alloc

		Number of transparent hugepages which were allocated to satisfy

		a page fault, including COW faults. This counter is not present

		when CONFIG_TRANSPARENT_HUGEPAGE is not set.

		a page fault. This counter is not present when CONFIG_TRANSPARENT_HUGEPAGE

                is not set.



	  thp_collapse_alloc

		Number of transparent hugepages which were allocated to allow

Documentation/admin-guide/mm/transhuge.rst

+1 −2
Original line number Diff line number Diff line
@@ -305,8 +305,7 @@ monitor how successfully the system is providing huge pages for use. 


thp_fault_alloc

	is incremented every time a huge page is successfully

	allocated to handle a page fault. This applies to both the

	first time a page is faulted and for COW faults.

	allocated to handle a page fault.



thp_collapse_alloc

	is incremented by khugepaged when it has found

Documentation/core-api/pin_user_pages.rst

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ all combinations of get*(), pin*(), FOLL_LONGTERM, and more. Also, the 
pin_user_pages*() APIs are clearly distinct from the get_user_pages*() APIs, so

that's a natural dividing line, and a good point to make separate wrapper calls.

In other words, use pin_user_pages*() for DMA-pinned pages, and

get_user_pages*() for other cases. There are four cases described later on in

get_user_pages*() for other cases. There are five cases described later on in

this document, to further clarify that concept.



FOLL_PIN and FOLL_GET are mutually exclusive for a given gup call. However,

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -16058,8 +16058,10 @@ SPARSE CHECKER 
M:	"Luc Van Oostenryck" <luc.vanoostenryck@gmail.com>

L:	linux-sparse@vger.kernel.org

S:	Maintained

W:	https://sparse.wiki.kernel.org/

W:	https://sparse.docs.kernel.org/

T:	git git://git.kernel.org/pub/scm/devel/sparse/sparse.git

Q:	https://patchwork.kernel.org/project/linux-sparse/list/

B:	https://bugzilla.kernel.org/enter_bug.cgi?component=Sparse&product=Tools

F:	include/linux/compiler.h















SPEAR CLOCK FRAMEWORK SUPPORT

































arch/arm64/kernel/probes/kprobes.c



+3
−9






























Original line number
Diff line number
Diff line








@@ -120,15 +120,9 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)





























void *alloc_insn_page(void)















{













	void *page;



























	page = vmalloc_exec(PAGE_SIZE);













	if (page) {













		set_memory_ro((unsigned long)page, 1);













		set_vm_flush_reset_perms(page);













	}



























	return page;













	return __vmalloc_node_range(PAGE_SIZE, 1, VMALLOC_START, VMALLOC_END,













			GFP_KERNEL, PAGE_KERNEL_ROX, VM_FLUSH_RESET_PERMS,













			NUMA_NO_NODE, __func__);















}































/* arm kprobe: install breakpoint in text */









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE