linux-next: build failure after merge of the final tree (cgroup tree related)

[Stephen Rothwell]

Hi all,

After merging the final tree, today's linux-next build (sparc defconfig)
failed like this:

arch/sparc/kernel/sun4m_irq.c: In function 'sun4m_build_device_irq':
arch/sparc/kernel/sun4m_irq.c:266:2: error: implicit declaration of function 'kzalloc' [-Werror=implicit-function-declaration]
arch/sparc/kernel/sun4m_irq.c:266:15: error: assignment makes pointer from integer without a cast [-Werror]

Presumably caused by commit 2bd59d48ebfb ("cgroup: convert to kernfs")
(see the comment in commit 1ff6bbfd13ca ("arm, pm, vmpressure: add
missing slab.h includes")).  I wonder how mane more builds are broken by
this :-(

Indeed, reverting that commit fixes the build.

I have added the following build fix for today (please check the
overnight builds for more breakage):

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 12 Feb 2014 16:01:10 +1100
Subject: [PATCH] sun4M: add include of slab.h for kzalloc

This was being included implicitly via cgroup.h's inclusion of xattr.h
(which has now been removed).

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 arch/sparc/kernel/sun4m_irq.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c
index c5ade9d27a1d..8bb3b3fddea7 100644
--- a/arch/sparc/kernel/sun4m_irq.c
+++ b/arch/sparc/kernel/sun4m_irq.c
@@ -9,6 +9,8 @@
  *  Copyright (C) 1996 Dave Redman (djhr@xxxxxxxxxxxxx)
  */
 
+#include <linux/slab.h>
+
 #include <asm/timer.h>
 #include <asm/traps.h>
 #include <asm/pgalloc.h>
-- 
1.9.rc1

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpML0f8XbpoR.pgp
Description: PGP signature