diff options
author | Konstantin Khlebnikov <khlebnikov@openvz.org> | 2012-10-08 19:29:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 03:22:19 -0400 |
commit | 314e51b9851b4f4e8ab302243ff5a6fc6147f379 (patch) | |
tree | f757b89206355fd129830782566768693eed23ce /sound/core | |
parent | 0103bd16fb90bc741c7a03fd1ea4e8a505abad23 (diff) |
mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
A long time ago, in v2.4, VM_RESERVED kept swapout process off VMA,
currently it lost original meaning but still has some effects:
| effect | alternative flags
-+------------------------+---------------------------------------------
1| account as reserved_vm | VM_IO
2| skip in core dump | VM_IO, VM_DONTDUMP
3| do not merge or expand | VM_IO, VM_DONTEXPAND, VM_HUGETLB, VM_PFNMAP
4| do not mlock | VM_IO, VM_DONTEXPAND, VM_HUGETLB, VM_PFNMAP
This patch removes reserved_vm counter from mm_struct. Seems like nobody
cares about it, it does not exported into userspace directly, it only
reduces total_vm showed in proc.
Thus VM_RESERVED can be replaced with VM_IO or pair VM_DONTEXPAND | VM_DONTDUMP.
remap_pfn_range() and io_remap_pfn_range() set VM_IO|VM_DONTEXPAND|VM_DONTDUMP.
remap_vmalloc_range() set VM_DONTEXPAND | VM_DONTDUMP.
[akpm@linux-foundation.org: drivers/vfio/pci/vfio_pci.c fixup]
Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Carsten Otte <cotte@de.ibm.com>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Eric Paris <eparis@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Morris <james.l.morris@oracle.com>
Cc: Jason Baron <jbaron@redhat.com>
Cc: Kentaro Takeda <takedakn@nttdata.co.jp>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Venkatesh Pallipadi <venki@google.com>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound/core')
-rw-r--r-- | sound/core/pcm_native.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 20554eff5a21..5e12e5bacbba 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c | |||
@@ -3039,7 +3039,7 @@ static int snd_pcm_mmap_status(struct snd_pcm_substream *substream, struct file | |||
3039 | return -EINVAL; | 3039 | return -EINVAL; |
3040 | area->vm_ops = &snd_pcm_vm_ops_status; | 3040 | area->vm_ops = &snd_pcm_vm_ops_status; |
3041 | area->vm_private_data = substream; | 3041 | area->vm_private_data = substream; |
3042 | area->vm_flags |= VM_RESERVED; | 3042 | area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; |
3043 | return 0; | 3043 | return 0; |
3044 | } | 3044 | } |
3045 | 3045 | ||
@@ -3076,7 +3076,7 @@ static int snd_pcm_mmap_control(struct snd_pcm_substream *substream, struct file | |||
3076 | return -EINVAL; | 3076 | return -EINVAL; |
3077 | area->vm_ops = &snd_pcm_vm_ops_control; | 3077 | area->vm_ops = &snd_pcm_vm_ops_control; |
3078 | area->vm_private_data = substream; | 3078 | area->vm_private_data = substream; |
3079 | area->vm_flags |= VM_RESERVED; | 3079 | area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; |
3080 | return 0; | 3080 | return 0; |
3081 | } | 3081 | } |
3082 | #else /* ! coherent mmap */ | 3082 | #else /* ! coherent mmap */ |
@@ -3170,7 +3170,7 @@ static const struct vm_operations_struct snd_pcm_vm_ops_data_fault = { | |||
3170 | int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream, | 3170 | int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream, |
3171 | struct vm_area_struct *area) | 3171 | struct vm_area_struct *area) |
3172 | { | 3172 | { |
3173 | area->vm_flags |= VM_RESERVED; | 3173 | area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; |
3174 | #ifdef ARCH_HAS_DMA_MMAP_COHERENT | 3174 | #ifdef ARCH_HAS_DMA_MMAP_COHERENT |
3175 | if (!substream->ops->page && | 3175 | if (!substream->ops->page && |
3176 | substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) | 3176 | substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) |