summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-01-21 15:27:28 +0100
committerTakashi Iwai <tiwai@suse.de>2010-01-21 15:27:28 +0100
commit6250b9ced23032789ca9739d6a53949637f9c836 (patch)
tree62379e6b563b45331f8d5d788e8ba7089b2fbaba /include
parent8b296c8f9f660b70e958e6e6b9b4293e6ae854f2 (diff)
parentc32d977b8157bf67cdf47729ce7dd054a26eb534 (diff)
Merge branch 'topic/noncached-mmap' into topic/misc
Diffstat (limited to 'include')
-rw-r--r--include/sound/pcm.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 768e3098656c..ee16122a1886 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -1022,6 +1022,10 @@ int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream, struct vm_area_s
#define snd_pcm_lib_mmap_iomem NULL
#endif
+int snd_pcm_lib_mmap_noncached(struct snd_pcm_substream *substream,
+ struct vm_area_struct *area);
+#define snd_pcm_lib_mmap_vmalloc snd_pcm_lib_mmap_noncached
+
static inline void snd_pcm_limit_isa_dma_size(int dma, size_t *max)
{
*max = dma < 4 ? 64 * 1024 : 128 * 1024;