From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Marek Szyprowski <m.szyprowski@samsung•com>,
Kyungmin Park <kyungmin.park@samsung•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Alessandro Rubini <rubini@gnudd•com>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Subject: linux-next: manual merge of the dma-mapping tree with the tip tree
Date: Mon, 23 Apr 2012 16:03:09 +1000 [thread overview]
Message-ID: <20120423160309.59622ba2cc2139dd50f742e9@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1374 bytes --]
Hi all,
Today's linux-next merge of the dma-mapping tree got a conflict in
arch/x86/include/asm/dma-mapping.h between commit f7219a5300ba ("x86:
Introduce CONFIG_X86_DMA_REMAP") from the tip tree and commit
cfe29d4b429b ("X86: integrate CMA with DMA-mapping subsystem") from the
dma-mapping tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/x86/include/asm/dma-mapping.h
index 61c0bd2,7b9227b..0000000
--- a/arch/x86/include/asm/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
@@@ -62,12 -63,10 +63,16 @@@ extern void *dma_generic_alloc_coherent
dma_addr_t *dma_addr, gfp_t flag,
struct dma_attrs *attrs);
+ extern void dma_generic_free_coherent(struct device *dev, size_t size,
+ void *vaddr, dma_addr_t dma_addr,
+ struct dma_attrs *attrs);
+
+#ifdef CONFIG_X86_DMA_REMAP /* Platform code defines bridge-specific code */
+extern bool dma_capable(struct device *dev, dma_addr_t addr, size_t size);
+extern dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);
+extern phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);
+#else
+
static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
{
if (!dev->dma_mask)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
reply other threads:[~2012-04-23 6:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20120423160309.59622ba2cc2139dd50f742e9@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=kyungmin.park@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=m.szyprowski@samsung$(echo .)com \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=rubini@gnudd$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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