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

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

Merge branch 'akpm' (incoming from Andrew) 

Merge first patch-bomb from Andrew Morton:

 - a couple of misc things

 - inotify/fsnotify work from Jan

 - ocfs2 updates (partial)

 - about half of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (117 commits)
  mm/migrate: remove unused function, fail_migrate_page()
  mm/migrate: remove putback_lru_pages, fix comment on putback_movable_pages
  mm/migrate: correct failure handling if !hugepage_migration_support()
  mm/migrate: add comment about permanent failure path
  mm, page_alloc: warn for non-blockable __GFP_NOFAIL allocation failure
  mm: compaction: reset scanner positions immediately when they meet
  mm: compaction: do not mark unmovable pageblocks as skipped in async compaction
  mm: compaction: detect when scanners meet in isolate_freepages
  mm: compaction: reset cached scanner pfn's before reading them
  mm: compaction: encapsulate defer reset logic
  mm: compaction: trace compaction begin and end
  memcg, oom: lock mem_cgroup_print_oom_info
  sched: add tracepoints related to NUMA task migration
  mm: numa: do not automatically migrate KSM pages
  mm: numa: trace tasks that fail migration due to rate limiting
  mm: numa: limit scope of lock for NUMA migrate rate limiting
  mm: numa: make NUMA-migrate related functions static
  lib/show_mem.c: show num_poisoned_pages when oom
  mm/hwpoison: add '#' to hwpoison_inject
  mm/memblock: use WARN_ONCE when MAX_NUMNODES passed as input parameter
  ...
parents fbd918a2 78d5506e

Documentation/filesystems/proc.txt

+9 −0
Original line number Diff line number Diff line
@@ -767,6 +767,7 @@ The "Locked" indicates whether the mapping is locked in memory or not. 


MemTotal:     16344972 kB

MemFree:      13634064 kB

MemAvailable: 14836172 kB

Buffers:          3656 kB

Cached:        1195708 kB

SwapCached:          0 kB
@@ -799,6 +800,14 @@ AnonHugePages: 49152 kB 
    MemTotal: Total usable ram (i.e. physical ram minus a few reserved

              bits and the kernel binary code)

     MemFree: The sum of LowFree+HighFree

MemAvailable: An estimate of how much memory is available for starting new

              applications, without swapping. Calculated from MemFree,

              SReclaimable, the size of the file LRU lists, and the low

              watermarks in each zone.

              The estimate takes into account that the system needs some

              page cache to function well, and that not all reclaimable

              slab will be reclaimable, due to items being in use. The

              impact of those factors will vary from system to system.

     Buffers: Relatively temporary storage for raw disk blocks

              shouldn't get tremendously large (20MB or so)

      Cached: in-memory cache for files read from the disk (the

Documentation/sysctl/vm.txt

+12 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ Currently, these files are in /proc/sys/vm: 
- numa_zonelist_order

- oom_dump_tasks

- oom_kill_allocating_task

- overcommit_kbytes

- overcommit_memory

- overcommit_ratio

- page-cluster
@@ -574,6 +575,17 @@ The default value is 0. 


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



overcommit_kbytes:



When overcommit_memory is set to 2, the committed address space is not

permitted to exceed swap plus this amount of physical RAM. See below.



Note: overcommit_kbytes is the counterpart of overcommit_ratio. Only one

of them may be specified at a time. Setting one disables the other (which

then appears as 0 when read).



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



overcommit_memory:



This value contains a flag that enables memory overcommitment.

Documentation/vm/overcommit-accounting

+4 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ The Linux kernel supports the following overcommit handling modes 


2	-	Don't overcommit. The total address space commit

		for the system is not permitted to exceed swap + a

		configurable percentage (default is 50) of physical RAM.

		Depending on the percentage you use, in most situations

		configurable amount (default is 50%) of physical RAM.

		Depending on the amount you use, in most situations

		this means a process will not be killed while accessing

		pages but will receive errors on memory allocation as

		appropriate.
@@ -26,7 +26,8 @@ The Linux kernel supports the following overcommit handling modes 


The overcommit policy is set via the sysctl `vm.overcommit_memory'.



The overcommit percentage is set via `vm.overcommit_ratio'.

The overcommit amount can be set via `vm.overcommit_ratio' (percentage)

or `vm.overcommit_kbytes' (absolute value).



The current overcommit limit and amount committed are viewable in

/proc/meminfo as CommitLimit and Committed_AS respectively.

arch/arm/include/asm/dma.h

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
#define MAX_DMA_ADDRESS	0xffffffffUL

#else

#define MAX_DMA_ADDRESS	({ \

	extern unsigned long arm_dma_zone_size; \

	arm_dma_zone_size ? \

	extern phys_addr_t arm_dma_zone_size; \

	arm_dma_zone_size && arm_dma_zone_size < (0x10000000 - PAGE_OFFSET) ? \

		(PAGE_OFFSET + arm_dma_zone_size) : 0xffffffffUL; })

#endif

arch/arm/kernel/devtree.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) 


void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)

{

	return alloc_bootmem_align(size, align);

	return memblock_virt_alloc(size, align);

}



void __init arm_dt_memblock_reserve(void)