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

[Stephen Rothwell]

Hi Andrew,

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

mm/cma.c: In function 'cma_declare_contiguous':
mm/cma.c:288:4: error: implicit declaration of function 'phys_to_virt' [-Werror=implicit-function-declaration]
    kmemleak_ignore(phys_to_virt(addr));
    ^

Caused by commit 2a70e5a78672 ("mm/cma: ake kmemleak ignore CMA regions").

I added the following fix patch:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 27 Oct 2014 15:25:09 +1100
Subject: [PATCH] mm/cma: include linux/io.h for phys_to_virt()

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 mm/cma.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mm/cma.c b/mm/cma.c
index 471fcfef043b..c22d7a8e0e3b 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -33,6 +33,7 @@
 #include <linux/log2.h>
 #include <linux/cma.h>
 #include <linux/highmem.h>
+#include <linux/io.h>
 
 struct cma {
 	unsigned long	base_pfn;

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpeMoFAyIBS1.pgp
Description: OpenPGP digital signature