Subject: linux-next: build failure after merge of the akpm-current tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 16 Apr 2014 16:06:17 +1000

Hi Andrew,

After merging the akpm tree, today's linux-next build (powerpc
ppc44x_defconfig) failed like this:

arch/powerpc/platforms/44x/warp.c: In function 'warp_probe':
arch/powerpc/platforms/44x/warp.c:52:2: error: 'ISA_DMA_THRESHOLD' undeclared (first use in this function)
arch/powerpc/mm/dma-noncoherent.c: In function '__dma_alloc_coherent':
arch/powerpc/mm/dma-noncoherent.c:159:13: error: 'ISA_DMA_THRESHOLD' undeclared (first use in this function)

Probably caused by commit ff35bd54456e ("lib/scatterlist: make
ARCH_HAS_SG_CHAIN an actual Kconfig") which removed an implicit include
of <asm/dma.h> with the removal of the arch specific scatterlist.h.

I have added the following patch for today:

From: Stephen Rothwell <[email-masked]>
Date: Wed, 16 Apr 2014 16:03:01 +1000
Subject: [PATCH] lib/scatterlist: make ARCH_HAS_SG_CHAIN an actual Kconfig fix

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 arch/powerpc/mm/dma-noncoherent.c | 1 +
 arch/powerpc/platforms/44x/warp.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/powerpc/mm/dma-noncoherent.c b/arch/powerpc/mm/dma-noncoherent.c
index 7b6c10750179..d85e86aac7fb 100644
--- a/arch/powerpc/mm/dma-noncoherent.c
+++ b/arch/powerpc/mm/dma-noncoherent.c
@@ -33,6 +33,7 @@
 #include <linux/export.h>
 
 #include <asm/tlbflush.h>
+#include <asm/dma.h>
 
 #include "mmu_decl.h"
 
diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c
index 534574a97ec9..3a104284b338 100644
--- a/arch/powerpc/platforms/44x/warp.c
+++ b/arch/powerpc/platforms/44x/warp.c
@@ -25,6 +25,7 @@
 #include <asm/time.h>
 #include <asm/uic.h>
 #include <asm/ppc4xx.h>
+#include <asm/dma.h>

 static __initdata struct of_device_id warp_of_bus[] = {
-- 
1.9.2

-- 
Cheers,
Stephen Rothwell                    [email-masked]