From: Nicolin Chen <nicoleotsuka@gmail.com>
To: dann frazier <dann.frazier@canonical.com>
Cc: Christoph Hellwig <hch@lst.de>,
Robin Murphy <robin.murphy@arm.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
chris@zankel.net, linux-xtensa@linux-xtensa.org,
keescook@chromium.org, sfr@canb.auug.org.au, tony@atomide.com,
Catalin Marinas <catalin.marinas@arm.com>,
joro@8bytes.org, Will Deacon <will.deacon@arm.com>,
linux@armlinux.org.uk, iommu@lists.linux-foundation.org,
linux-kernel@vger.kernel.org, jcmvbkbc@gmail.com,
wsa+renesas@sang-engineering.com, akpm@linux-foundation.org,
treding@nvidia.com, dwmw2@infradead.org, iamjoonsoo.kim@lge.com,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v2 1/2] dma-contiguous: Abstract dma_{alloc, free}_contiguous()
Date: Thu, 23 May 2019 20:49:04 -0700 [thread overview]
Message-ID: <20190524034904.GA30034@Asurada-Nvidia.nvidia.com> (raw)
In-Reply-To: <CALdTtnuwRKkna_y5_5BdEYWNRbOQnLvtfz1PY-d4r78tj5hgVw@mail.gmail.com>
On Thu, May 23, 2019 at 08:59:30PM -0600, dann frazier wrote:
> > > diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c
> > > index b2a87905846d..21f39a6cb04f 100644
> > > --- a/kernel/dma/contiguous.c
> > > +++ b/kernel/dma/contiguous.c
> > > @@ -214,6 +214,54 @@ bool dma_release_from_contiguous(struct device *dev, struct page *pages,
> > > return cma_release(dev_get_cma_area(dev), pages, count);
> > > }
> >
> > This breaks the build for me if CONFIG_DMA_CMA=n:
> >
> > LD [M] fs/9p/9p.o
> > ld: fs/9p/vfs_inode.o: in function `dma_alloc_contiguous':
> > vfs_inode.c:(.text+0xa60): multiple definition of
> > `dma_alloc_contiguous'; fs/9p/vfs_super.o:vfs_super.c:(.text+0x500):
> > first defined here
> >
> > Do the following insertions need to be under an #ifdef CONFIG_DMA_CMA ?
>
> Ah, no - the problem is actually a missing "static inline" in the
> !CONFIG_DMA_CMA version of dma_alloc_contiguous().
Yea, I saw it. Thanks for the testing and pointing it out.
Sending v3.....
next prev parent reply other threads:[~2019-05-24 3:50 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-06 22:33 [PATCH v2 0/2] Optimize dma_*_from_contiguous calls Nicolin Chen
2019-05-06 22:33 ` [PATCH v2 1/2] dma-contiguous: Abstract dma_{alloc,free}_contiguous() Nicolin Chen
2019-05-24 1:52 ` [PATCH v2 1/2] dma-contiguous: Abstract dma_{alloc, free}_contiguous() dann frazier
2019-05-24 2:59 ` dann frazier
2019-05-24 3:49 ` Nicolin Chen [this message]
2019-05-06 22:33 ` [PATCH v2 2/2] dma-contiguous: Use fallback alloc_pages for single pages Nicolin Chen
2019-08-23 12:49 ` Masahiro Yamada
2019-08-23 12:56 ` Masahiro Yamada
2019-08-25 1:10 ` Christoph Hellwig
2019-08-26 2:05 ` Masahiro Yamada
2019-08-26 7:33 ` Christoph Hellwig
2019-08-27 7:45 ` Masahiro Yamada
2019-08-27 7:50 ` Christoph Hellwig
2019-08-27 9:03 ` Masahiro Yamada
2019-08-27 11:55 ` Christoph Hellwig
2019-08-28 10:53 ` Masahiro Yamada
2019-08-28 12:23 ` Masahiro Yamada
2019-08-29 11:45 ` Masahiro Yamada
2019-08-23 22:11 ` Nicolin Chen
2019-08-26 1:56 ` Masahiro Yamada
2019-05-08 12:52 ` [PATCH v2 0/2] Optimize dma_*_from_contiguous calls Christoph Hellwig
2019-05-08 18:08 ` Nicolin Chen
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=20190524034904.GA30034@Asurada-Nvidia.nvidia.com \
--to=nicoleotsuka@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=chris@zankel.net \
--cc=dann.frazier@canonical.com \
--cc=dwmw2@infradead.org \
--cc=hch@lst.de \
--cc=iamjoonsoo.kim@lge.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jcmvbkbc@gmail.com \
--cc=joro@8bytes.org \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linux@armlinux.org.uk \
--cc=m.szyprowski@samsung.com \
--cc=robin.murphy@arm.com \
--cc=sfr@canb.auug.org.au \
--cc=tony@atomide.com \
--cc=treding@nvidia.com \
--cc=will.deacon@arm.com \
--cc=wsa+renesas@sang-engineering.com \
/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;
as well as URLs for NNTP newsgroup(s).