From patchwork Fri Jan 24 08:23:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Dubey X-Patchwork-Id: 3534831 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CB71D9F1C3 for ; Fri, 24 Jan 2014 13:57:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 37E0C20123 for ; Fri, 24 Jan 2014 13:57:54 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DBC6320122 for ; Fri, 24 Jan 2014 13:57:52 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6hGW-0001CL-4x; Fri, 24 Jan 2014 13:57:48 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6bod-0000Bj-AU; Fri, 24 Jan 2014 08:08:39 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6boY-0000B7-VG for linux-arm-kernel@lists.infradead.org; Fri, 24 Jan 2014 08:08:36 +0000 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MZW00E1BBXERO80@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 24 Jan 2014 17:08:02 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.48]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 81.DF.10364.26F12E25; Fri, 24 Jan 2014 17:08:02 +0900 (KST) X-AuditID: cbfee690-b7f266d00000287c-f0-52e21f623eb5 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 5F.25.28157.26F12E25; Fri, 24 Jan 2014 17:08:02 +0900 (KST) Received: from localhost.localdomain ([12.23.120.139]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MZW005B8BX7RH30@mmp1.samsung.com>; Fri, 24 Jan 2014 17:08:02 +0900 (KST) From: Pankaj Dubey To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: fix build error if DMA_CMA is enabled Date: Fri, 24 Jan 2014 17:23:08 +0900 Message-id: <1390551788-6138-1-git-send-email-pankaj.dubey@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDLMWRmVeSWpSXmKPExsVy+t8zA90k+UdBBmuOqlu8X9bDaLG9cwa7 xabH11gtLu+aw2axaOsXdotVH6azWLz8eILFgd1jzbw1jB6X+3qZPDYvqffo27KK0ePzJrkA 1igum5TUnMyy1CJ9uwSujCOHVrEUzGavODqjia2BcTZbFyMnh4SAicTWs1OYIWwxiQv31gPF uTiEBJYxSvx/0czaxcgBVtQ4QRikRkhgEaPE8p81EDVtTBJb9q9kBUmwCehKPHk/F2yQiICb xI3GDiaQImaBmYwSU55+AUsIC9hKfLu7EKyBRUBVYtmvdSwgNq+Au8Tthk9MEMsUJOZMsgHp lRBoZpe4fbCJGaJeQOLb5EMsEDWyEpsOQB0tKXFwxQ2WCYyCCxgZVjGKphYkFxQnpReZ6BUn 5haX5qXrJefnbmKEhOyEHYz3DlgfYkwGGjeRWUo0OR8Y8nkl8YbGZkYWpiamxkbmlmakCSuJ 86o9SgoSEkhPLEnNTk0tSC2KLyrNSS0+xMjEwSnVwJj25e5uprVv5ofx3zFQlj7SGPY+esfE s/1zj9ek3mTWK9lms/Fq4l3BymU+7Q2tL2/tPKdeoredP9lze8jC56fnt81PP34g2NXzfqzS vcoAWw2ZbfvF1nVJHlBMZvyygSX28b15cqWd110jm/zUwtcdPFpu9CjGM+DkiSSG2W/2b1sk wxTMkKfEUpyRaKjFXFScCAB81Y49bwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJIsWRmVeSWpSXmKPExsVy+t9jAd0k+UdBBvc/Klm8X9bDaLG9cwa7 xabH11gtLu+aw2axaOsXdotVH6azWLz8eILFgd1jzbw1jB6X+3qZPDYvqffo27KK0ePzJrkA 1qgGRpuM1MSU1CKF1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wcoDOU FMoSc0qBQgGJxcVK+naYJoSGuOlawDRG6PqGBMH1GBmggYR1jBlHDq1iKZjNXnF0RhNbA+Ns ti5GDg4JAROJxgnCXYycQKaYxIV769lAbCGBRYwSy3/WdDFyAdltTBJb9q9kBUmwCehKPHk/ lxnEFhFwk7jR2MEEUsQsMJNRYsrTL2AJYQFbiW93F4I1sAioSiz7tY4FxOYVcJe43fCJCWKx gsScSTYTGLkXMDKsYhRNLUguKE5KzzXSK07MLS7NS9dLzs/dxAiOiGfSOxhXNVgcYhTgYFTi 4Z0R+DBIiDWxrLgy9xCjBAezkghv/TWgEG9KYmVValF+fFFpTmrxIcZkoOUTmaVEk/OB0ZpX Em9obGJmZGlkZmFkYm5OmrCSOO/BVutAIYH0xJLU7NTUgtQimC1MHJxSDYzzp5+M5L3y6NLn LJfrBnOmt9wViHlovayq5RzLm5Oa4i7bt8jINRdEdH5ZxftBKiTY0uBU38HjJ/1WbKj+8UEu offBUQ7e1sr1xtpebV9mz/H9IPksev+MI8/E3vBKfjvqJeggzG+9sr6TSV9d6OK1qUfjetc6 GQodmfXif4Diz26D34ekUz8rsRRnJBpqMRcVJwIAfE9PlcwCAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140124_030835_225009_C93A292B X-CRM114-Status: UNSURE ( 9.30 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -7.4 (-------) Cc: lauraa@codeaurora.org, catalin.marinas@arm.com, Somraj Mani , will.deacon@arm.com, Pankaj Dubey X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP arm64/include/asm/dma-contiguous.h is trying to include which does not exist, and thus failing build for arm64 if we enable CONFIG_DMA_CMA. This patch fixes build error by removing unwanted header inclusion from arm64's dma-contiguous.h. Signed-off-by: Pankaj Dubey Signed-off-by: Somraj Mani Acked-by: Laura Abbott --- arch/arm64/include/asm/dma-contiguous.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/include/asm/dma-contiguous.h b/arch/arm64/include/asm/dma-contiguous.h index d6aacb6..14c4c0c 100644 --- a/arch/arm64/include/asm/dma-contiguous.h +++ b/arch/arm64/include/asm/dma-contiguous.h @@ -18,7 +18,6 @@ #ifdef CONFIG_DMA_CMA #include -#include static inline void dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) { }