summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-10-28 16:08:27 +0100
committerTakashi Iwai <tiwai@suse.de>2013-10-28 16:08:27 +0100
commit63437313daaf90b372d5b383a8cc6ec8dce185fa (patch)
tree46f1d4dad4280faab7898c1dbccb38621718e144 /sound/core
parenta655f75c7502e5000c8745f458d3dbb9777f4aca (diff)
downloadop-kernel-dev-63437313daaf90b372d5b383a8cc6ec8dce185fa.zip
op-kernel-dev-63437313daaf90b372d5b383a8cc6ec8dce185fa.tar.gz
ALSA: memalloc: Yet another ifdef CONFIG_GENERIC_ALLOCATOR protection
I obviously forgot to merge the right version... Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/memalloc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index 51a7921..809fd79 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -159,6 +159,7 @@ static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr,
dma_free_coherent(dev, PAGE_SIZE << pg, ptr, dma);
}
+#ifdef CONFIG_GENERIC_ALLOCATOR
/**
* snd_malloc_dev_iram - allocate memory from on-chip internal ram
* @dmab: buffer allocation record to store the allocated data
@@ -198,6 +199,7 @@ void snd_free_dev_iram(struct snd_dma_buffer *dmab)
if (pool && dmab->area)
gen_pool_free(pool, (unsigned long)dmab->area, dmab->bytes);
}
+#endif /* CONFIG_GENERIC_ALLOCATOR */
#endif /* CONFIG_HAS_DMA */
/*
OpenPOWER on IntegriCloud