diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-01-21 14:27:28 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-01-21 14:27:28 (GMT) |
commit | 6250b9ced23032789ca9739d6a53949637f9c836 (patch) | |
tree | 62379e6b563b45331f8d5d788e8ba7089b2fbaba /include | |
parent | 8b296c8f9f660b70e958e6e6b9b4293e6ae854f2 (diff) | |
parent | c32d977b8157bf67cdf47729ce7dd054a26eb534 (diff) | |
download | linux-6250b9ced23032789ca9739d6a53949637f9c836.tar.xz |
Merge branch 'topic/noncached-mmap' into topic/misc
Diffstat (limited to 'include')
-rw-r--r-- | include/sound/pcm.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 768e309..ee16122 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; |