Commit d42f323a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc updates from Andrew Morton:
 "A few misc subsystems and some of MM.

  175 patches.

  Subsystems affected by this patch series: ia64, kbuild, scripts, sh,
  ocfs2, kfifo, vfs, kernel/watchdog, and mm (slab-generic, slub,
  kmemleak, debug, pagecache, msync, gup, memremap, memcg, pagemap,
  mremap, dma, sparsemem, vmalloc, documentation, kasan, initialization,
  pagealloc, and memory-failure)"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (175 commits)
  mm/memory-failure: unnecessary amount of unmapping
  mm/mmzone.h: fix existing kernel-doc comments and link them to core-api
  mm: page_alloc: ignore init_on_free=1 for debug_pagealloc=1
  net: page_pool: use alloc_pages_bulk in refill code path
  net: page_pool: refactor dma_map into own function page_pool_dma_map
  SUNRPC: refresh rq_pages using a bulk page allocator
  SUNRPC: set rq_page_end differently
  mm/page_alloc: inline __rmqueue_pcplist
  mm/page_alloc: optimize code layout for __alloc_pages_bulk
  mm/page_alloc: add an array-based interface to the bulk page allocator
  mm/page_alloc: add a bulk page allocator
  mm/page_alloc: rename alloced to allocated
  mm/page_alloc: duplicate include linux/vmalloc.h
  mm, page_alloc: avoid page_to_pfn() in move_freepages()
  mm/Kconfig: remove default DISCONTIGMEM_MANUAL
  mm: page_alloc: dump migrate-failed pages
  mm/mempolicy: fix mpol_misplaced kernel-doc
  mm/mempolicy: rewrite alloc_pages_vma documentation
  mm/mempolicy: rewrite alloc_pages documentation
  mm/mempolicy: rename alloc_pages_current to alloc_pages
  ...
parents 65ec0a7d 4d75136b

Documentation/admin-guide/kernel-parameters.txt

+7 −0
Original line number Original line Diff line number Diff line
@@ -4996,6 +4996,10 @@ 




	slram=		[HW,MTD]

	slram=		[HW,MTD]





	slab_merge	[MM]

			Enable merging of slabs with similar size when the

			kernel is built without CONFIG_SLAB_MERGE_DEFAULT.



	slab_nomerge	[MM]

	slab_nomerge	[MM]

			Disable merging of slabs with similar size. May be

			Disable merging of slabs with similar size. May be

			necessary if there is some reason to distinguish

			necessary if there is some reason to distinguish
@@ -5043,6 +5047,9 @@ 
			lower than slub_max_order.

			lower than slub_max_order.

			For more information see Documentation/vm/slub.rst.

			For more information see Documentation/vm/slub.rst.





	slub_merge	[MM, SLUB]

			Same with slab_merge.



	slub_nomerge	[MM, SLUB]

	slub_nomerge	[MM, SLUB]

			Same with slab_nomerge. This is supported for legacy.

			Same with slab_nomerge. This is supported for legacy.

			See slab_nomerge for more information.

			See slab_nomerge for more information.

Documentation/admin-guide/mm/transhuge.rst

+1 −1
Original line number Original line Diff line number Diff line
@@ -402,7 +402,7 @@ compact_fail 
	but failed.

	but failed.





It is possible to establish how long the stalls were using the function

It is possible to establish how long the stalls were using the function

tracer to record how long was spent in __alloc_pages_nodemask and

tracer to record how long was spent in __alloc_pages() and

using the mm_page_alloc tracepoint to identify which allocations were

using the mm_page_alloc tracepoint to identify which allocations were

for huge pages.

for huge pages.

Documentation/core-api/cachetlb.rst

+2 −2
Original line number Original line Diff line number Diff line
@@ -213,9 +213,9 @@ Here are the routines, one by one: 
	there will be no entries in the cache for the kernel address

	there will be no entries in the cache for the kernel address

	space for virtual addresses in the range 'start' to 'end-1'.

	space for virtual addresses in the range 'start' to 'end-1'.





	The first of these two routines is invoked after map_kernel_range()

	The first of these two routines is invoked after vmap_range()

	has installed the page table entries.  The second is invoked

	has installed the page table entries.  The second is invoked

	before unmap_kernel_range() deletes the page table entries.

	before vunmap_range() deletes the page table entries.





There exists another whole class of cpu cache issues which currently

There exists another whole class of cpu cache issues which currently

require a whole different set of interfaces to handle properly.

require a whole different set of interfaces to handle properly.

Documentation/core-api/mm-api.rst

+6 −0
Original line number Original line Diff line number Diff line
@@ -92,3 +92,9 @@ More Memory Management Functions 
   :export:

   :export:





.. kernel-doc:: mm/page_alloc.c

.. kernel-doc:: mm/page_alloc.c

.. kernel-doc:: mm/mempolicy.c

.. kernel-doc:: include/linux/mm_types.h

   :internal:

.. kernel-doc:: include/linux/mm.h

   :internal:

.. kernel-doc:: include/linux/mmzone.h