Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757020Ab3H2Sgv (ORCPT ); Thu, 29 Aug 2013 14:36:51 -0400 Received: from smtp.citrix.com ([66.165.176.89]:8808 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756557Ab3H2Scz (ORCPT ); Thu, 29 Aug 2013 14:32:55 -0400 X-IronPort-AV: E=Sophos;i="4.89,984,1367971200"; d="scan'208";a="48860312" From: Stefano Stabellini To: CC: , , , , , Stefano Stabellini , Subject: [PATCH v5 04/13] arm64: do not initialize arm64_swiotlb if dma_ops is already set Date: Thu, 29 Aug 2013 19:32:25 +0100 Message-ID: <1377801154-29215-4-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 871 Lines: 28 Signed-off-by: Stefano Stabellini Acked-by: Catalin Marinas CC: will.deacon@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); } -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/