mm: don't overwrite mm->def_flags in do_mlockall()
authorGerald Schaefer <[email protected]>
Tue, 12 Feb 2013 21:46:20 +0000 (13:46 -0800)
committerLinus Torvalds <[email protected]>
Tue, 12 Feb 2013 22:34:00 +0000 (14:34 -0800)
commit9977f0f164d46613288e0b5778eae500dfe06f31
treed854a1cc5c422107028ed9dfab4360a9b5d40395
parent3399cfb5df9594495b876d1843a7165f77366b2b
mm: don't overwrite mm->def_flags in do_mlockall()

With commit 8e72033f2a48 ("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 <[email protected]>
Reported-by: Vivek Goyal <[email protected]>
Cc: Andrea Arcangeli <[email protected]>
Cc: Hugh Dickins <[email protected]>
Cc: Martin Schwidefsky <[email protected]>
Cc: Heiko Carstens <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
mm/mlock.c