hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Takashi Iwai 2013-10-28 16:08:27 +01:00
parent a655f75c75
commit 63437313da
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/core/memalloc.c
View File

@ -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); dma_free_coherent(dev, PAGE_SIZE << pg, ptr, dma);
} }
#ifdef CONFIG_GENERIC_ALLOCATOR
/** /**
* snd_malloc_dev_iram - allocate memory from on-chip internal ram * snd_malloc_dev_iram - allocate memory from on-chip internal ram
* @dmab: buffer allocation record to store the allocated data * @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) if (pool && dmab->area)
gen_pool_free(pool, (unsigned long)dmab->area, dmab->bytes); gen_pool_free(pool, (unsigned long)dmab->area, dmab->bytes);
} }
#endif /* CONFIG_GENERIC_ALLOCATOR */
#endif /* CONFIG_HAS_DMA */ #endif /* CONFIG_HAS_DMA */
/* /*