2014-06-25-16-44 merged
Andrew Morton (3):
slab-use-get_node-and-kmem_cache_node-functions-fix-2-fix
mm-vmallocc-add-a-schedule-point-to-vmalloc-fix
mm-replace-remap_file_pages-syscall-with-emulation-fix
Christoph Lameter (1):
SLOB has no node specific management structures.
Daniel Walter (4):
arch/x86: replace strict_strto calls
drivers/scsi: replace strict_strto calls
net/sunrpc: replace strict_strto calls
include/linux: remove strict_strto* definitions
David Rientjes (2):
mm, vmalloc: constify allocation mask
mm, pcp: allow restoring percpu_pagelist_fraction default
Eric Dumazet (1):
mm/vmalloc.c: add a schedule point to vmalloc()
Fabian Frederick (1):
kernel/kprobes.c: convert printk to pr_foo()
Greg Thelen (1):
memcg: remove lookup_cgroup_page() prototype
Hugh Dickins (4):
mm: thp: fix DEBUG_PAGEALLOC oops in copy_page_rep()
mm: let mm_find_pmd fix buggy race with THP fault
shmem: fix faulting into a hole while it's punched
mm: fix crashes from mbind() merging vmas
Ian Kent (1):
autofs4: fix false positive compile error
Joe Perches (23):
pci-dma-compat: add pci_zalloc_consistent helper
atm: use pci_zalloc_consistent
block: use pci_zalloc_consistent
crypto: use pci_zalloc_consistent
infiniband: use pci_zalloc_consistent
i810: use pci_zalloc_consistent
media: use pci_zalloc_consistent
amd: use pci_zalloc_consistent
atl1e: use pci_zalloc_consistent
enic: use pci_zalloc_consistent
sky2: use pci_zalloc_consistent
micrel: use pci_zalloc_consistent
qlogic: use pci_zalloc_consistent
irda: use pci_zalloc_consistent
ipw2100: use pci_zalloc_consistent
mwl8k: use pci_zalloc_consistent
rtl818x: use pci_zalloc_consistent
rtlwifi: use pci_zalloc_consistent
scsi: use pci_zalloc_consistent
staging: use pci_zalloc_consistent
synclink_gt: use pci_zalloc_consistent
vme: bridges: use pci_zalloc_consistent
drivers/net/ethernet/amd/pcnet32.c: neaten and remove unnecessary OOM messages
Johannes Weiner (7):
mm: page-flags: clean up the page flag test, set, clear macros
kernel: uprobes: switch to new memcg charge protocol
mm: memcontrol: rewrite uncharge API fix 2
mm: vmscan: remove remains of kswapd-managed zone->all_unreclaimable
mm: vmscan: rework compaction-ready signaling in direct reclaim
mm: vmscan: remove all_unreclaimable()
mm: vmscan: move swappiness out of scan_control
Joonsoo Kim (4):
CMA: fix ARM build failure related to MAX_CMA_AREAS definition
slub: fix off by one in number of slab tests
PPC, KVM: fix build failure due to removed file
slab: fix oops when reading /proc/slab_allocators
Kirill A. Shutemov (1):
mm: replace remap_file_pages() syscall with emulation
Konstantin Khlebnikov (3):
shmem: fix double uncharge in __shmem_file_setup()
shmem: update memory reservation on truncate
mm: catch memory commitment underflow
Max Asbock (1):
mm tracing: tell mm_migrate_pages event about numa_misplaced
Michal Hocko (3):
Reverted "mm-memcontrol-rewrite-charge-api-fix"
Reverted "mm-memcontrol-rewrite-uncharge-api-fix"
memcg: mem_cgroup_charge_statistics needs preempt_disable
Michal Nazarewicz (1):
mm: page_alloc: fix CMA area initialisation when pageblock > MAX_ORDER
Qiang Huang (1):
mm/page_alloc.c: update comments for get/set_pfnblock_flags_mask
Sasha Levin (2):
mm: remap_file_pages: initialize populate before usage
mm: remap_file_pages: grab file ref to prevent race while mmaping
Shuah Khan (2):
tools: cpu-hotplug fix unexpected operator error
tools: memory-hotplug fix unexpected operator error
Vladimir Davydov (5):
slub: kmem_cache_shrink: check if partial list is empty under list_lock
slab: set free_limit for dead caches to 0
page-cgroup: fix flags definition
page-cgroup: trivial cleanup
page-cgroup: get rid of NR_PCG_FLAGS
Wang Nan (1):
mem-hotplug: improve zone_movable_is_highmem logic
Wang Sheng-Hui (1):
mm: update the description for madvise_remove
Wei Yang (1):
slub: reduce duplicate creation on the first object
mm: fix crashes from mbind() merging vmas
In v2.6.34 commit 9d8cebd4bcd7 ("mm: fix mbind vma merge problem")
introduced vma merging to mbind(), but it should have also changed the
convention of passing start vma from queue_pages_range() (formerly
check_range()) to new_vma_page(): vma merging may have already freed
that structure, resulting in BUG at mm/mempolicy.c:1738 and probably
worse crashes.
Fixes: 9d8cebd4bcd7 ("mm: fix mbind vma merge problem")
Reported-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Tested-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Signed-off-by: Hugh Dickins <hughd@google.com>
Acked-by: Christoph Lameter <cl@linux.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Minchan Kim <minchan.kim@gmail.com>
Cc: <stable@vger.kernel.org> [2.6.34+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit d05f0cdcbe6388723f1900c549b4850360545201)
1 file changed
