Commit 0cad3ff4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (Fixes from Andrew) 

Merge misc fixes from Andrew Morton.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (12 patches)
  revert "mm: fix-up zone present pages"
  tmpfs: change final i_blocks BUG to WARNING
  tmpfs: fix shmem_getpage_gfp() VM_BUG_ON
  mm: highmem: don't treat PKMAP_ADDR(LAST_PKMAP) as a highmem address
  mm: revert "mm: vmscan: scale number of pages reclaimed by reclaim/compaction based on failures"
  rapidio: fix kernel-doc warnings
  swapfile: fix name leak in swapoff
  memcg: fix hotplugged memory zone oops
  mips, arc: fix build failure
  memcg: oom: fix totalpages calculation for memory.swappiness==0
  mm: fix build warning for uninitialized value
  mm: add anon_vma_lock to validate_mm()
parents 1d567e19 5576646f

Documentation/cgroups/memory.txt

+4 −0
Original line number Diff line number Diff line
@@ -466,6 +466,10 @@ Note: 
5.3 swappiness



Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only.

Please note that unlike the global swappiness, memcg knob set to 0

really prevents from any swapping even if there is a swap storage

available. This might lead to memcg OOM killer if there are no file

pages to reclaim.



Following cgroups' swappiness can't be changed.

- root cgroup (uses /proc/sys/vm/swappiness).

arch/ia64/mm/init.c

+0 −1
Original line number Diff line number Diff line
@@ -637,7 +637,6 @@ mem_init (void) 


	high_memory = __va(max_low_pfn * PAGE_SIZE);



	reset_zone_present_pages();

	for_each_online_pgdat(pgdat)

		if (pgdat->bdata->node_bootmem_map)

			totalram_pages += free_all_bootmem_node(pgdat);

arch/mips/fw/arc/misc.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/irqflags.h>



#include <asm/bcache.h>

drivers/rapidio/rio.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ EXPORT_SYMBOL_GPL(rio_release_inb_pwrite); 
/**

 * rio_map_inb_region -- Map inbound memory region.

 * @mport: Master port.

 * @lstart: physical address of memory region to be mapped

 * @local: physical address of memory region to be mapped

 * @rbase: RIO base address assigned to this window

 * @size: Size of the memory region

 * @rflags: Flags for mapping.

include/linux/mm.h

+0 −4
Original line number Diff line number Diff line
@@ -1684,9 +1684,5 @@ static inline unsigned int debug_guardpage_minorder(void) { return 0; } 
static inline bool page_is_guard(struct page *page) { return false; }

#endif /* CONFIG_DEBUG_PAGEALLOC */



extern void reset_zone_present_pages(void);

extern void fixup_zone_present_pages(int nid, unsigned long start_pfn,

				unsigned long end_pfn);



#endif /* __KERNEL__ */

#endif /* _LINUX_MM_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE