From: benh@kernel.crashing.org (Benjamin Herrenschmidt)
To: linux-arm-kernel@lists.infradead.org
Subject: arm: Move the definition of ARCH_HAS_DMA_MMAP_COHERENT where it belongs
Date: Fri, 25 Mar 2011 17:47:50 +1100 [thread overview]
Message-ID: <1301035670.2402.468.camel@pasglop> (raw)
Something I noticed while implementing dma_mmap_coherent() for powerpc...
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/arm/include/asm/dma-mapping.h | 2 +-
sound/core/pcm_native.c | 7 -------
2 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index 4fff837..ed33eab 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -214,7 +214,7 @@ extern void dma_free_coherent(struct device *, size_t, void *, dma_addr_t);
*/
int dma_mmap_coherent(struct device *, struct vm_area_struct *,
void *, dma_addr_t, size_t);
-
+#define ARCH_HAS_DMA_MMAP_COHERENT
/**
* dma_alloc_writecombine - allocate writecombining memory for DMA
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index ae42b65..2d99c37 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -3145,13 +3145,6 @@ static const struct vm_operations_struct snd_pcm_vm_ops_data_fault = {
.fault = snd_pcm_mmap_data_fault,
};
-#ifndef ARCH_HAS_DMA_MMAP_COHERENT
-/* This should be defined / handled globally! */
-#ifdef CONFIG_ARM
-#define ARCH_HAS_DMA_MMAP_COHERENT
-#endif
-#endif
-
/*
* mmap the DMA buffer on RAM
*/
next reply other threads:[~2011-03-25 6:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-25 6:47 Benjamin Herrenschmidt [this message]
2011-03-25 8:02 ` arm: Move the definition of ARCH_HAS_DMA_MMAP_COHERENT where it belongs Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1301035670.2402.468.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox