All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christoph Hellwig <hch@lst.de>,
	Alexey Kardashevskiy <aik@ozlabs.ru>,
	Michael Ellerman <mpe@ellerman.id.au>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the dma-mapping tree
Date: Fri, 27 Nov 2020 10:33:04 +0100	[thread overview]
Message-ID: <20201127093304.GA14976@lst.de> (raw)
In-Reply-To: <20201127175801.538fbb30@canb.auug.org.au>

I fixed this as shown:

diff --git a/arch/powerpc/kernel/dma-iommu.c b/arch/powerpc/kernel/dma-iommu.c
index c724548ca295c0..111249fd619de8 100644
--- a/arch/powerpc/kernel/dma-iommu.c
+++ b/arch/powerpc/kernel/dma-iommu.c
@@ -10,6 +10,7 @@
 #include <linux/pci.h>
 #include <asm/iommu.h>
 
+#ifdef CONFIG_ARCH_HAS_DMA_MAP_DIRECT
 #define can_map_direct(dev, addr) \
 	((dev)->bus_dma_limit >= phys_to_dma((dev), (addr)))
 
@@ -64,6 +65,7 @@ bool arch_dma_unmap_sg_direct(struct device *dev, struct scatterlist *sg,
 
 	return true;
 }
+#endif /* CONFIG_ARCH_HAS_DMA_MAP_DIRECT */
 
 /*
  * Generic iommu implementation

  parent reply	other threads:[~2020-11-27  9:33 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-27  6:58 linux-next: build failure after merge of the dma-mapping tree Stephen Rothwell
2020-11-27  9:21 ` Christoph Hellwig
2020-11-27  9:59   ` Stephen Rothwell
2020-11-27  9:33 ` Christoph Hellwig [this message]
     [not found] <CGME20260327200715eucas1p1953ce4c0b4d4e0cd95844f0acdb7ac3a@eucas1p1.samsung.com>
2026-03-27 20:07 ` Mark Brown
2026-03-30  7:56   ` Marek Szyprowski
2026-03-30  8:11     ` Maxime Ripard
  -- strict thread matches above, loose matches on Subject: below --
2024-07-10  1:05 Stephen Rothwell
2024-07-10  5:58 ` Christoph Hellwig
2024-05-07 23:16 Stephen Rothwell
2024-05-08  6:51 ` Christoph Hellwig
2024-05-08  8:51   ` Alexander Lobakin
2024-05-08 13:45     ` Christoph Hellwig
2012-02-13  5:40 Stephen Rothwell
2012-02-13  7:31 ` Kyungmin Park
2012-02-13 15:05 ` Marek Szyprowski

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=20201127093304.GA14976@lst.de \
    --to=hch@lst.de \
    --cc=aik@ozlabs.ru \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mpe@ellerman.id.au \
    --cc=sfr@canb.auug.org.au \
    /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 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.