2013-02-06-17-13 merged
Andrew Morton (1):
acpi-memory-hotplug-support-getting-hotplug-info-from-srat-fix-fix
Gerald Schaefer (1):
mm: don't overwrite mm->def_flags in do_mlockall()
Michal Hocko (8):
Reverted "mm: make mlockall preserve flags other than VM_LOCKED in def_flags"
Reverted "mm/slub.c: include memory_hotplug.h"
Reverted "mm-break-circular-include-from-linux-mmzoneh-fix-fix"
Reverted "mm-break-circular-include-from-linux-mmzoneh-fix-fix-fix"
Reverted "mm: break circular include from linux/mmzone.h"
Reverted "fix mm: use long type for page counts in mm_populate() and get_user_pages()"
Reverted "mm: accelerate mm_populate() treatment of THP pages"
Reverted "mm: accelerate munlock() treatment of THP pages"
Zhang Yanfei (7):
mm: fix return type for functions nr_free_*_pages
ia64: use %ld to print pages calculated in nr_free_buffer_pages
fs/buffer.c: change type of max_buffer_heads to unsigned long
fs/nfsd: change type of max_delegations, nfsd_drc_max_mem and nfsd_drc_mem_used
vmscan: change type of vm_total_pages to unsigned long
net: change type of netns_ipvs->sysctl_sync_qlen_max
net: change type of virtio_chan->p9_max_pages
mm: don't overwrite mm->def_flags in do_mlockall()
With commit 8e72033 "thp: make MADV_HUGEPAGE check for mm->def_flags"
the VM_NOHUGEPAGE flag may be set on s390 in mm->def_flags for certain
processes, to prevent future thp mappings. This would be overwritten
by do_mlockall(), which sets it back to 0 with an optional VM_LOCKED
flag set.
To fix this, instead of overwriting mm->def_flags in do_mlockall(),
only the VM_LOCKED flag should be set or cleared.
Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Reported-by: Vivek Goyal <vgoyal@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 file changed
