diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/core/pcm_native.c | 6 | ||||
-rw-r--r-- | sound/usb/usx2y/us122l.c | 2 | ||||
-rw-r--r-- | sound/usb/usx2y/usX2Yhwdep.c | 2 | ||||
-rw-r--r-- | sound/usb/usx2y/usx2yhwdeppcm.c | 2 |
4 files changed, 6 insertions, 6 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) |
diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c index c4fd3b1d9592..d0323a693ba2 100644 --- a/sound/usb/usx2y/us122l.c +++ b/sound/usb/usx2y/us122l.c | |||
@@ -262,7 +262,7 @@ static int usb_stream_hwdep_mmap(struct snd_hwdep *hw, | |||
262 | } | 262 | } |
263 | 263 | ||
264 | area->vm_ops = &usb_stream_hwdep_vm_ops; | 264 | area->vm_ops = &usb_stream_hwdep_vm_ops; |
265 | area->vm_flags |= VM_RESERVED; | 265 | area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; |
266 | area->vm_private_data = us122l; | 266 | area->vm_private_data = us122l; |
267 | atomic_inc(&us122l->mmap_count); | 267 | atomic_inc(&us122l->mmap_count); |
268 | out: | 268 | out: |
diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c index 04aafb43a13c..0b34dbc8f302 100644 --- a/sound/usb/usx2y/usX2Yhwdep.c +++ b/sound/usb/usx2y/usX2Yhwdep.c | |||
@@ -82,7 +82,7 @@ static int snd_us428ctls_mmap(struct snd_hwdep * hw, struct file *filp, struct v | |||
82 | us428->us428ctls_sharedmem->CtlSnapShotLast = -2; | 82 | us428->us428ctls_sharedmem->CtlSnapShotLast = -2; |
83 | } | 83 | } |
84 | area->vm_ops = &us428ctls_vm_ops; | 84 | area->vm_ops = &us428ctls_vm_ops; |
85 | area->vm_flags |= VM_RESERVED | VM_DONTEXPAND; | 85 | area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; |
86 | area->vm_private_data = hw->private_data; | 86 | area->vm_private_data = hw->private_data; |
87 | return 0; | 87 | return 0; |
88 | } | 88 | } |
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c index 8e40b6e67e9e..cc56007791e0 100644 --- a/sound/usb/usx2y/usx2yhwdeppcm.c +++ b/sound/usb/usx2y/usx2yhwdeppcm.c | |||
@@ -723,7 +723,7 @@ static int snd_usX2Y_hwdep_pcm_mmap(struct snd_hwdep * hw, struct file *filp, st | |||
723 | return -ENODEV; | 723 | return -ENODEV; |
724 | } | 724 | } |
725 | area->vm_ops = &snd_usX2Y_hwdep_pcm_vm_ops; | 725 | area->vm_ops = &snd_usX2Y_hwdep_pcm_vm_ops; |
726 | area->vm_flags |= VM_RESERVED | VM_DONTEXPAND; | 726 | area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; |
727 | area->vm_private_data = hw->private_data; | 727 | area->vm_private_data = hw->private_data; |
728 | return 0; | 728 | return 0; |
729 | } | 729 | } |