[PATCH v4 05/10] arm64: do not initialize arm64_swiotlb if dma_ops is already set
From: catalin.marinas@arm.com (Catalin Marinas)
Date: 2013-08-19 16:56:27
Also in:
lkml, xen-devel
On Thu, Aug 15, 2013 at 12:10:49PM +0100, Stefano Stabellini wrote:
quoted hunk ↗ jump to hunk
Signed-off-by: Stefano Stabellini <redacted> CC: catalin.marinas at arm.com CC: will.deacon at arm.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);
Acked-by: Catalin Marinas <catalin.marinas@arm.com>