diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-21 15:27:28 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-21 15:27:28 +0100 |
| commit | 6250b9ced23032789ca9739d6a53949637f9c836 (patch) | |
| tree | 62379e6b563b45331f8d5d788e8ba7089b2fbaba /sound/core | |
| parent | 8b296c8f9f660b70e958e6e6b9b4293e6ae854f2 (diff) | |
| parent | c32d977b8157bf67cdf47729ce7dd054a26eb534 (diff) | |
| download | kernel_goldelico_gta04-6250b9ced23032789ca9739d6a53949637f9c836.zip kernel_goldelico_gta04-6250b9ced23032789ca9739d6a53949637f9c836.tar.gz kernel_goldelico_gta04-6250b9ced23032789ca9739d6a53949637f9c836.tar.bz2 | |
Merge branch 'topic/noncached-mmap' into topic/misc
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm_native.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 43552fd..b53fa84 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -3165,9 +3165,7 @@ int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream, long size; unsigned long offset; -#ifdef pgprot_noncached area->vm_page_prot = pgprot_noncached(area->vm_page_prot); -#endif area->vm_flags |= VM_IO; size = area->vm_end - area->vm_start; offset = area->vm_pgoff << PAGE_SHIFT; @@ -3181,6 +3179,15 @@ int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream, EXPORT_SYMBOL(snd_pcm_lib_mmap_iomem); #endif /* SNDRV_PCM_INFO_MMAP */ +/* mmap callback with pgprot_noncached */ +int snd_pcm_lib_mmap_noncached(struct snd_pcm_substream *substream, + struct vm_area_struct *area) +{ + area->vm_page_prot = pgprot_noncached(area->vm_page_prot); + return snd_pcm_default_mmap(substream, area); +} +EXPORT_SYMBOL(snd_pcm_lib_mmap_noncached); + /* * mmap DMA buffer */ |