diff options
author | Hugh Dickins <hugh.dickins@tiscali.co.uk> | 2009-09-21 17:02:25 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 07:17:33 -0700 |
commit | 8314c4f24a0a5c9b1f7544e9fa83a1d5367ddaa7 (patch) | |
tree | f3265e2ff817e447c11b9f9070ce1eed9a19731a /mm/swap_state.c | |
parent | 7701c9c0f54feb682d0cefa2ae1f4a1e00e0ba09 (diff) | |
download | linux-3.10-8314c4f24a0a5c9b1f7544e9fa83a1d5367ddaa7.tar.gz linux-3.10-8314c4f24a0a5c9b1f7544e9fa83a1d5367ddaa7.tar.bz2 linux-3.10-8314c4f24a0a5c9b1f7544e9fa83a1d5367ddaa7.zip |
ksm: remove VM_MERGEABLE_FLAGS
KSM originally stood for Kernel Shared Memory: but the kernel has long
supported shared memory, and VM_SHARED and VM_MAYSHARE vmas, and KSM is
something else. So we switched to saying "merge" instead of "share".
But Chris Wright points out that this is confusing where mmap.c merges
adjacent vmas: most especially in the name VM_MERGEABLE_FLAGS, used by
is_mergeable_vma() to let vmas be merged despite flags being different.
Call it VMA_MERGE_DESPITE_FLAGS? Perhaps, but at present it consists
only of VM_CAN_NONLINEAR: so for now it's clearer on all sides to use
that directly, with a comment on it in is_mergeable_vma().
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Acked-by: Izik Eidus <ieidus@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/swap_state.c')
0 files changed, 0 insertions, 0 deletions