Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp4251465ybl; Mon, 26 Aug 2019 07:44:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqzMv7GtzmJnwKQbUCYS3YqhXb3WOm3iY7EB7MWMyVClrJy2MCwIHQKR3eWMqY8uLgdHPpo4 X-Received: by 2002:a17:902:f30e:: with SMTP id gb14mr19461674plb.32.1566830664610; Mon, 26 Aug 2019 07:44:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566830664; cv=none; d=google.com; s=arc-20160816; b=x0uLG7bDmK22cu9FYR4Ll4l9CUpAehn6KrY7vQH6gwceatEUmd90Z6ZWSgvVmg7Njx AlUPc5hvpj1bR2kTznkfOTl3tsGD/CLiQcKJ1DCcVyM1Kz7swXQJndRuIEXa8lh8PTJI b4C2DG/gwGBd6qJnp9rYXrJ4Bm/ky38oQjOiqCxSZAV7gQBptt58h+0jH0XC3kD2xOnm hwjZHGIXD8HTtgec9KisYsJcQOL2y7/ODLU6J85ZVirmeSHxr3h+wgR3RvSjl/OUdyLZ kARohpkIsY0LjjR8HYstzh/tf+FgpM9ZmV/Ai7wh/Mk+PkeouGtYeygWROZnGG6wve/K US7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jtYBca8klqBOT2cMFIwtTS4Yo/ScZgTti7DMykKSX5w=; b=GLI4urPI1zLZUnbbirkXX5oLvbDihrBILIkFZiEBPesv2c4C2vsVjm9a0xd+kObV4K OIZsrk93G8UWNHYiy9YRXMjinPFzWrBwNGdUJTYDBnsqsioUO2JbjzyvKAIF+lqtQmB8 YGM3T+RrpYkQuURu7aaoEEXBM7J71ccT+jayYQT7W88+zppLMssAMOkFKFlY1g+6F6F0 BAXruwFMaEBa/zeSqLrNRa8yMRpQhBdm23F30WWgRE0KRFHJPmke8jg0xAFgTRyarIfc j0KxS48QRBD+UcyThLX3isEerRW7iGGpmwy6GGUHSAl6Ujxvun4rVr4Q+Bsa/M8O4Dm4 dGHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=TqVsVFY1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d7si9677873pjx.68.2019.08.26.07.44.08; Mon, 26 Aug 2019 07:44:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=TqVsVFY1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731928AbfHZMUZ (ORCPT + 99 others); Mon, 26 Aug 2019 08:20:25 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:50840 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731914AbfHZMUW (ORCPT ); Mon, 26 Aug 2019 08:20:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type: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=jtYBca8klqBOT2cMFIwtTS4Yo/ScZgTti7DMykKSX5w=; b=TqVsVFY1TpWM61S2Qf3BHmeTOX Yd2jAgC4+J5opaUqJiK8voKYIBhok4BYc74CKTm4vndHQbX07K+eZRuLQ/pgG9UCvxC8PeSzARY1/ YOzmPlHObM4oGcIXDHVKpN3BGEuiF9PkrmzSHfqGaMpL7DbFsNwQixz3cbNK24pcuox5bPJhmNuGF WS8MJrdgnWd4RySScxOOFvpXFKnXIoR93jXWGZzpWcqjrM6Sv1McQ3kPVBT/qF4QtX/fXJJclbjZB OnYVpj979zH3d4yFHaA88FRpbExPUbQThKBx75RJ6wUUwjnqByexU0wD16FVB0Gdxt4WXP0WZj8h7 Yy+/D7Gw==; Received: from clnet-p19-102.ikbnet.co.at ([83.175.77.102] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1i2Dyr-0003uc-LI; Mon, 26 Aug 2019 12:20:18 +0000 From: Christoph Hellwig To: Stefano Stabellini , Konrad Rzeszutek Wilk Cc: x86@kernel.org, linux-arm-kernel@lists.infradead.org, xen-devel@lists.xenproject.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Will Deacon Subject: [PATCH 11/11] arm64: use asm-generic/dma-mapping.h Date: Mon, 26 Aug 2019 14:19:44 +0200 Message-Id: <20190826121944.515-12-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190826121944.515-1-hch@lst.de> References: <20190826121944.515-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the Xen special cases are gone nothing worth mentioning is left in the arm64 file, so switch to use the asm-generic version instead. Signed-off-by: Christoph Hellwig Acked-by: Will Deacon --- arch/arm64/include/asm/Kbuild | 1 + arch/arm64/include/asm/dma-mapping.h | 22 ---------------------- arch/arm64/mm/dma-mapping.c | 1 + 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 arch/arm64/include/asm/dma-mapping.h diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild index c52e151afab0..98a5405c8558 100644 --- a/arch/arm64/include/asm/Kbuild +++ b/arch/arm64/include/asm/Kbuild @@ -4,6 +4,7 @@ generic-y += delay.h generic-y += div64.h generic-y += dma.h generic-y += dma-contiguous.h +generic-y += dma-mapping.h generic-y += early_ioremap.h generic-y += emergency-restart.h generic-y += hw_irq.h diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h deleted file mode 100644 index 67243255a858..000000000000 --- a/arch/arm64/include/asm/dma-mapping.h +++ /dev/null @@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (C) 2012 ARM Ltd. - */ -#ifndef __ASM_DMA_MAPPING_H -#define __ASM_DMA_MAPPING_H - -#ifdef __KERNEL__ - -#include -#include - -#include -#include - -static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) -{ - return NULL; -} - -#endif /* __KERNEL__ */ -#endif /* __ASM_DMA_MAPPING_H */ diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 4b244a037349..6578abcfbbc7 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include -- 2.20.1