* [PATCH] ALSA: pcm: Protect call to dma_mmap_coherent() by check for HAS_DMA
@ 2017-07-09 19:31 ` Geert Uytterhoeven
0 siblings, 0 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2017-07-09 19:31 UTC (permalink / raw)
To: Jaroslav Kysela, Takashi Iwai
Cc: alsa-devel, linux-kernel, Geert Uytterhoeven
If NO_DMA=y:
sound/core/pcm_native.o: In function `snd_pcm_lib_default_mmap':
pcm_native.c:(.text+0x144c): undefined reference to `bad_dma_ops'
pcm_native.c:(.text+0x1474): undefined reference to `dma_common_mmap'
Add a check for HAS_DMA to fix this.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
sound/core/pcm_native.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index b3d5bed750297ec2..e540a22aa3d8988a 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -3502,7 +3502,7 @@ int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream,
}
#endif /* CONFIG_GENERIC_ALLOCATOR */
#ifndef CONFIG_X86 /* for avoiding warnings arch/x86/mm/pat.c */
- if (!substream->ops->page &&
+ if (IS_ENABLED(CONFIG_HAS_DMA) && !substream->ops->page &&
substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV)
return dma_mmap_coherent(substream->dma_buffer.dev.dev,
area,
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ALSA: pcm: Protect call to dma_mmap_coherent() by check for HAS_DMA
@ 2017-07-09 19:31 ` Geert Uytterhoeven
0 siblings, 0 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2017-07-09 19:31 UTC (permalink / raw)
To: Jaroslav Kysela, Takashi Iwai
Cc: alsa-devel, Geert Uytterhoeven, linux-kernel
If NO_DMA=y:
sound/core/pcm_native.o: In function `snd_pcm_lib_default_mmap':
pcm_native.c:(.text+0x144c): undefined reference to `bad_dma_ops'
pcm_native.c:(.text+0x1474): undefined reference to `dma_common_mmap'
Add a check for HAS_DMA to fix this.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
sound/core/pcm_native.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index b3d5bed750297ec2..e540a22aa3d8988a 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -3502,7 +3502,7 @@ int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream,
}
#endif /* CONFIG_GENERIC_ALLOCATOR */
#ifndef CONFIG_X86 /* for avoiding warnings arch/x86/mm/pat.c */
- if (!substream->ops->page &&
+ if (IS_ENABLED(CONFIG_HAS_DMA) && !substream->ops->page &&
substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV)
return dma_mmap_coherent(substream->dma_buffer.dev.dev,
area,
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ALSA: pcm: Protect call to dma_mmap_coherent() by check for HAS_DMA
2017-07-09 19:31 ` Geert Uytterhoeven
@ 2017-07-10 14:04 ` Takashi Iwai
-1 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2017-07-10 14:04 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Jaroslav Kysela, alsa-devel, linux-kernel
On Sun, 09 Jul 2017 21:31:02 +0200,
Geert Uytterhoeven wrote:
>
> If NO_DMA=y:
>
> sound/core/pcm_native.o: In function `snd_pcm_lib_default_mmap':
> pcm_native.c:(.text+0x144c): undefined reference to `bad_dma_ops'
> pcm_native.c:(.text+0x1474): undefined reference to `dma_common_mmap'
>
> Add a check for HAS_DMA to fix this.
>
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Applied, thanks.
Takashi
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ALSA: pcm: Protect call to dma_mmap_coherent() by check for HAS_DMA
@ 2017-07-10 14:04 ` Takashi Iwai
0 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2017-07-10 14:04 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Jaroslav Kysela, alsa-devel, linux-kernel
On Sun, 09 Jul 2017 21:31:02 +0200,
Geert Uytterhoeven wrote:
>
> If NO_DMA=y:
>
> sound/core/pcm_native.o: In function `snd_pcm_lib_default_mmap':
> pcm_native.c:(.text+0x144c): undefined reference to `bad_dma_ops'
> pcm_native.c:(.text+0x1474): undefined reference to `dma_common_mmap'
>
> Add a check for HAS_DMA to fix this.
>
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Applied, thanks.
Takashi
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-07-10 14:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-09 19:31 [PATCH] ALSA: pcm: Protect call to dma_mmap_coherent() by check for HAS_DMA Geert Uytterhoeven
2017-07-09 19:31 ` Geert Uytterhoeven
2017-07-10 14:04 ` Takashi Iwai
2017-07-10 14:04 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.