Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'akpm' (patches from Andrew) 

Merge updates from Andrew Morton:

 - a few misc bits

 - ocfs2 updates

 - almost all of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (131 commits)
  memory hotplug: fix comments when adding section
  mm: make alloc_node_mem_map a void call if we don't have CONFIG_FLAT_NODE_MEM_MAP
  mm: simplify nodemask printing
  mm,oom_reaper: remove pointless kthread_run() error check
  mm/page_ext.c: check if page_ext is not prepared
  writeback: remove unused function parameter
  mm: do not rely on preempt_count in print_vma_addr
  mm, sparse: do not swamp log with huge vmemmap allocation failures
  mm/hmm: remove redundant variable align_end
  mm/list_lru.c: mark expected switch fall-through
  mm/shmem.c: mark expected switch fall-through
  mm/page_alloc.c: broken deferred calculation
  mm: don't warn about allocations which stall for too long
  fs: fuse: account fuse_inode slab memory as reclaimable
  mm, page_alloc: fix potential false positive in __zone_watermark_ok
  mm: mlock: remove lru_add_drain_all()
  mm, sysctl: make NUMA stats configurable
  shmem: convert shmem_init_inodecache() to void
  Unify migrate_pages and move_pages access checks
  mm, pagevec: rename pagevec drained field
  ...
parents 6363b3f3 1b7176ae

Documentation/admin-guide/kernel-parameters.txt

+0 −7
Original line number Diff line number Diff line
@@ -1864,13 +1864,6 @@ 
			Built with CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y,

			the default is off.



	kmemcheck=	[X86] Boot-time kmemcheck enable/disable/one-shot mode

			Valid arguments: 0, 1, 2

			kmemcheck=0 (disabled)

			kmemcheck=1 (enabled)

			kmemcheck=2 (one-shot mode)

			Default: 2 (one-shot mode)



	kvm.ignore_msrs=[KVM] Ignore guest accesses to unhandled MSRs.

			Default is 0 (don't ignore, but inject #GP)

Documentation/dev-tools/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ whole; patches welcome! 
   kasan

   ubsan

   kmemleak

   kmemcheck

   gdb-kernel-debugging

   kgdb

   kselftest

Documentation/dev-tools/kmemcheck.rst

deleted100644 → 0
+0 −733

File deleted.

Preview size limit exceeded, changes collapsed.

Documentation/filesystems/proc.txt

+0 −1
Original line number Diff line number Diff line
@@ -250,7 +250,6 @@ Table 1-2: Contents of the status files (as of 4.8) 
 VmExe                       size of text segment

 VmLib                       size of shared library code

 VmPTE                       size of page table entries

 VmPMD                       size of second level page tables

 VmSwap                      amount of swap used by anonymous private data

                             (shmem swap usage is not included)

 HugetlbPages                size of hugetlb memory portions

Documentation/sysctl/vm.txt

+24 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ Currently, these files are in /proc/sys/vm: 
- percpu_pagelist_fraction

- stat_interval

- stat_refresh

- numa_stat

- swappiness

- user_reserve_kbytes

- vfs_cache_pressure
@@ -157,6 +158,10 @@ Note: the minimum value allowed for dirty_bytes is two pages (in bytes); any 
value lower than this limit will be ignored and the old configuration will be

retained.



Note: the value of dirty_bytes also must be set greater than

dirty_background_bytes or the amount of memory corresponding to

dirty_background_ratio.



==============================================================



dirty_expire_centisecs
@@ -176,6 +181,9 @@ generating disk writes will itself start writing out dirty data. 


The total available memory is not equal to total system memory.



Note: dirty_ratio must be set greater than dirty_background_ratio or

ratio corresponding to dirty_background_bytes.



==============================================================



dirty_writeback_centisecs
@@ -622,7 +630,7 @@ oom_dump_tasks 


Enables a system-wide task dump (excluding kernel threads) to be produced

when the kernel performs an OOM-killing and includes such information as

pid, uid, tgid, vm size, rss, nr_ptes, nr_pmds, swapents, oom_score_adj

pid, uid, tgid, vm size, rss, pgtables_bytes, swapents, oom_score_adj

score, and name.  This is helpful to determine why the OOM killer was

invoked, to identify the rogue task that caused it, and to determine why

the OOM killer chose the task it did to kill.
@@ -792,6 +800,21 @@ with no ill effects: errors and warnings on these stats are suppressed.) 


==============================================================



numa_stat



This interface allows runtime configuration of numa statistics.



When page allocation performance becomes a bottleneck and you can tolerate

some possible tool breakage and decreased numa counter precision, you can

do:

	echo 0 > /proc/sys/vm/numa_stat



When page allocation performance is not a bottleneck and you want all

tooling to work, you can do:

	echo 1 > /proc/sys/vm/numa_stat



==============================================================



swappiness



This control is used to define how aggressive the kernel will swap