From patchwork Fri Dec 29 08:19:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10136527 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A4BCD60318 for ; Fri, 29 Dec 2017 08:26:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 928BB2BF45 for ; Fri, 29 Dec 2017 08:26:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 876162C14E; Fri, 29 Dec 2017 08:26:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F3912BF45 for ; Fri, 29 Dec 2017 08:26:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756143AbdL2IXu (ORCPT ); Fri, 29 Dec 2017 03:23:50 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:37082 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756082AbdL2IXp (ORCPT ); Fri, 29 Dec 2017 03:23:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=qEJPxY82r722va3wccbE9gkR0QaVccvPVmnX2w6WlZA=; b=Xe3UpygPIT5bZiSJXvkyl3VAL 2Y5d7eEJb6WymusDvWnjApj1dC9ZYNNuHIdUZVcg+Vq26jAlsbuk0oPTOawXP0a83tlEDzDS8zPBP tT164QEdL46EFmXr2W2sG17+4fhlsDZ6Es/VrYMXqtHN9zAhTm8Tzvg4pMIL01lPCk0G68HeiXok/ WhUolVw9xRw029WO+m9wXVkpbiAVMxzkEiK2j3AYmjQ5IIsPiGwxDRVOZF6KfCAMKylAf9fvELww9 s66v3cp2fww50xLhvgjWQdH2eAsiKqm2W40t05voC5eRM5Zhy1+6FlGB9mYdXc4BtIOXSR/McNBAS 1RpUheL1Q==; Received: from 77.117.237.29.wireless.dyn.drei.com ([77.117.237.29] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.89 #1 (Red Hat Linux)) id 1eUpwx-0003hM-4D; Fri, 29 Dec 2017 08:23:31 +0000 From: Christoph Hellwig To: iommu@lists.linux-foundation.org Cc: linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, adi-buildroot-devel@lists.sourceforge.net, linux-c6x-dev@linux-c6x.org, linux-cris-kernel@axis.com, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-metag@vger.kernel.org, Michal Simek , linux-mips@linux-mips.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, patches@groups.riscv.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, Guan Xuetao , x86@kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 58/67] ia64: remove an ifdef around the content of pci-dma.c Date: Fri, 29 Dec 2017 09:19:02 +0100 Message-Id: <20171229081911.2802-59-hch@lst.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171229081911.2802-1-hch@lst.de> References: <20171229081911.2802-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The file is only compiled if CONFIG_INTEL_IOMMU is set to start with. Signed-off-by: Christoph Hellwig --- arch/ia64/kernel/pci-dma.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c index 35e0cad33b7d..b5df084c0af4 100644 --- a/arch/ia64/kernel/pci-dma.c +++ b/arch/ia64/kernel/pci-dma.c @@ -12,12 +12,7 @@ #include #include #include - - -#ifdef CONFIG_INTEL_IOMMU - #include - #include dma_addr_t bad_dma_address __read_mostly; @@ -115,5 +110,3 @@ void __init pci_iommu_alloc(void) } #endif /* CONFIG_SWIOTLB */ } - -#endif