linux-kernel - Re: linux-next: build failure after merge of the slave-dma tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Tue, 27 Mar 2012 14:03:14 +0530
From:	Vinod Koul <vinod.koul@...ux.intel.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Javier Martin <javier.martin@...ta-silicon.com>,
	Sascha Hauer <s.hauer@...gutronix.de>
Subject: Re: linux-next: build failure after merge of the slave-dma tree

On Tue, 2012-03-27 at 11:52 +1100, Stephen Rothwell wrote:
> Hi Vinod,
> 
> After merging the slave-dma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/dma/imx-dma.c:31:22: fatal error: mach/dma.h: No such file or directory
> 
> Caused by commit 6bd081277ea0 ("dmaengine: imx-dma: merge old dma-v1.c
> with imx-dma.c").
Thanks Stephen,

This should have depends on ARCH_MXS at least and should not have built
for x86_64. Below patch should fix it and I will apply this.

> 
> I have used the slave-dma tree from next-20120326 for today.
> 
> I was wondering why this new work appeared during the merge window ...
I had this series pending and wanted to get this merged but it didn't
apply for me last week and I was out for the long weekend :(
So merged on first chance I got back.

Tree is frozen now, barring any other hiccups. Sorry for the issue
--------------------------------x-------------------x----------------------

>>From 9da98b21787488f9d99b7f93b42aee95bfd07c49 Mon Sep 17 00:00:00 2001
From: Vinod Koul <vinod.koul@...ux.intel.com>
Date: Tue, 27 Mar 2012 13:53:00 +0530
Subject: [PATCH] dmaengine: imx: fix the build failure on x64

commit 6bd081277ea0 "dmaengine: imx-dma: merge old dma-v1.c with
imx-dma.c" removed the dependency in config for the imx dma driver,
whereas it should depend on ARCH_MXS

Signed-off-by: Vinod Koul <vinod.koul@...ux.intel.com>
---
 drivers/dma/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index b4a53a0..34e48d9 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -230,6 +230,7 @@ config IMX_SDMA
 
 config IMX_DMA
 	tristate "i.MX DMA support"
+	depends on ARCH_MXC
 	select DMA_ENGINE
 	help
 	  Support the i.MX DMA engine. This engine is integrated into
-- 
1.7.0.4


-- 
~Vinod

--
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/