From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E367AC2D0E4 for ; Fri, 27 Nov 2020 09:33:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7BC76206DF for ; Fri, 27 Nov 2020 09:33:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726127AbgK0JdI (ORCPT ); Fri, 27 Nov 2020 04:33:08 -0500 Received: from verein.lst.de ([213.95.11.211]:37002 "EHLO verein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726034AbgK0JdH (ORCPT ); Fri, 27 Nov 2020 04:33:07 -0500 Received: by verein.lst.de (Postfix, from userid 2407) id C59F368B05; Fri, 27 Nov 2020 10:33:04 +0100 (CET) Date: Fri, 27 Nov 2020 10:33:04 +0100 From: Christoph Hellwig To: Stephen Rothwell Cc: Christoph Hellwig , Alexey Kardashevskiy , Michael Ellerman , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: build failure after merge of the dma-mapping tree Message-ID: <20201127093304.GA14976@lst.de> References: <20201127175801.538fbb30@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201127175801.538fbb30@canb.auug.org.au> User-Agent: Mutt/1.5.17 (2007-11-01) Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 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 #include +#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