[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1377801154-29215-4-git-send-email-stefano.stabellini@eu.citrix.com>
Date: Thu, 29 Aug 2013 19:32:25 +0100
From: Stefano Stabellini <stefano.stabellini@...citrix.com>
To: <xen-devel@...ts.xensource.com>
CC: <linux-kernel@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>, <konrad.wilk@...cle.com>,
<Stefano.Stabellini@...citrix.com>, <Ian.Campbell@...rix.com>,
Stefano Stabellini <stefano.stabellini@...citrix.com>,
<will.deacon@....com>
Subject: [PATCH v5 04/13] arm64: do not initialize arm64_swiotlb if dma_ops is already set
Signed-off-by: Stefano Stabellini <stefano.stabellini@...citrix.com>
Acked-by: Catalin Marinas <catalin.marinas@....com>
CC: will.deacon@....com
---
arch/arm64/mm/dma-mapping.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index 4bd7579..a006e84 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -63,6 +63,8 @@ static struct dma_map_ops arm64_swiotlb_dma_ops = {
void __init arm64_swiotlb_init(void)
{
+ if (dma_ops != NULL)
+ return;
dma_ops = &arm64_swiotlb_dma_ops;
swiotlb_init(1);
}
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists