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()
Showing
- Documentation/cgroups/memory.txt 4 additions, 0 deletionsDocumentation/cgroups/memory.txt
- arch/ia64/mm/init.c 0 additions, 1 deletionarch/ia64/mm/init.c
- arch/mips/fw/arc/misc.c 1 addition, 0 deletionsarch/mips/fw/arc/misc.c
- drivers/rapidio/rio.c 1 addition, 1 deletiondrivers/rapidio/rio.c
- include/linux/mm.h 0 additions, 4 deletionsinclude/linux/mm.h
- include/linux/mmzone.h 1 addition, 1 deletioninclude/linux/mmzone.h
- include/linux/rio.h 2 additions, 0 deletionsinclude/linux/rio.h
- mm/bootmem.c 1 addition, 9 deletionsmm/bootmem.c
- mm/highmem.c 1 addition, 1 deletionmm/highmem.c
- mm/memcontrol.c 50 additions, 17 deletionsmm/memcontrol.c
- mm/memory.c 4 additions, 6 deletionsmm/memory.c
- mm/memory_hotplug.c 0 additions, 7 deletionsmm/memory_hotplug.c
- mm/mmap.c 2 additions, 0 deletionsmm/mmap.c
- mm/mmzone.c 1 addition, 5 deletionsmm/mmzone.c
- mm/nobootmem.c 0 additions, 3 deletionsmm/nobootmem.c
- mm/page_alloc.c 1 addition, 35 deletionsmm/page_alloc.c
- mm/shmem.c 15 additions, 3 deletionsmm/shmem.c
- mm/swapfile.c 2 additions, 2 deletionsmm/swapfile.c
- mm/vmscan.c 0 additions, 25 deletionsmm/vmscan.c
Loading
Please register or sign in to comment