Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1247277

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

Show all headers | View raw

Hi Vinod,

After merging the slave-dma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/dma/idma64.h:19:47: fatal error: asm-generic/io-64-nonatomic-lo-hi.h: No such file or directory
 #include <asm-generic/io-64-nonatomic-lo-hi.h>
                                               ^

Caused by commit

  97c37accd38f ("dmaengine: idma64: use lo_hi_readq() / lo_hi_writeq()")

interacting with commit

  f626fe17485b ("move io-64-nonatomic*.h out of asm-generic")

from the asm-generic tree.

I have applied the folling merge fix patch and can carry it as necessary.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 15 Oct 2015 11:47:07 +1100
Subject: [PATCH] dmaengine: idma64: merge fix for "move io-64-nonatomic*.h out of asm-generic"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/dma/idma64.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/dma/idma64.h b/drivers/dma/idma64.h
index f6aeff0af8a5..801d5462d663 100644
--- a/drivers/dma/idma64.h
+++ b/drivers/dma/idma64.h
@@ -15,8 +15,7 @@
 #include <linux/io.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
-
-#include <asm-generic/io-64-nonatomic-lo-hi.h>
+#include <linux/io-64-nonatomic-lo-hi.h>
 
 #include "virt-dma.h"
 
-- 
2.5.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
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/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: build failure after merge of the slave-dma tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-15 03:00 +0200
  Re: linux-next: build failure after merge of the slave-dma tree "Koul, Vinod" <vinod.koul@intel.com> - 2015-10-15 05:40 +0200
    Re: linux-next: build failure after merge of the slave-dma tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-15 06:00 +0200
      Re: linux-next: build failure after merge of the slave-dma tree Arnd Bergmann <arnd@arndb.de> - 2015-10-15 16:10 +0200
        Re: linux-next: build failure after merge of the slave-dma tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-15 16:30 +0200

csiph-web