From b485767268c0637120e2cd3650d89112ac349cb1 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Fri, 25 Mar 2011 17:51:54 +1100 Subject: [PATCH] --- yaml --- r: 242961 b: refs/heads/master c: 3674f19dabd15f9541079a588149a370d888f4e6 h: refs/heads/master i: 242959: f7d8c7999d1abbca3f09c243196d1dc9ebbe0577 v: v3 --- [refs] | 2 +- trunk/include/sound/pcm.h | 4 +--- trunk/sound/core/pcm_native.c | 9 --------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index fb77b329acb7..c3c7739575d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20b67dddcc5f29d3d0c900225d85e0ac655bc69d +refs/heads/master: 3674f19dabd15f9541079a588149a370d888f4e6 diff --git a/trunk/include/sound/pcm.h b/trunk/include/sound/pcm.h index 430a9cc045e2..e1bad1130616 100644 --- a/trunk/include/sound/pcm.h +++ b/trunk/include/sound/pcm.h @@ -1031,9 +1031,7 @@ 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 +#define snd_pcm_lib_mmap_vmalloc NULL static inline void snd_pcm_limit_isa_dma_size(int dma, size_t *max) { diff --git a/trunk/sound/core/pcm_native.c b/trunk/sound/core/pcm_native.c index ae42b6509ce4..fe5c8036beba 100644 --- a/trunk/sound/core/pcm_native.c +++ b/trunk/sound/core/pcm_native.c @@ -3201,15 +3201,6 @@ 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 */