diff mbox

linux-next: cpus4096 tree build failure

Message ID 20090319215300.1833d28e.sfr@canb.auug.org.au (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Stephen Rothwell March 19, 2009, 10:53 a.m. UTC
Hi all,

Today's linux-next build (powerpc allyesconfig) failed like this:

In file included from include/linux/mmzone.h:776,
                 from include/linux/gfp.h:5,
                 from include/linux/kmod.h:23,
                 from include/linux/module.h:14,
                 from init/version.c:11:
arch/powerpc/include/asm/mmzone.h:32: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'numa_cpumask_lookup_table'

and many more.

Probably caused by commit 082edb7bf443eb8eda15b482d16ad9dd8137ad24 ("numa,
cpumask: move numa_node_id default implementation to topology.h") from
the cpus4096 tree which removed the include of linux/topology.h from
linux/mmzone.h.

I have added the following patch for today.  There may be a better fix.

Comments

Rusty Russell March 19, 2009, 11:07 a.m. UTC | #1
On Thursday 19 March 2009 21:23:00 Stephen Rothwell wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 19 Mar 2009 21:35:24 +1100
> Subject: [PATCH] powerpc: mmzone.h needs cpumask_t to be defined
> 
> Commit 082edb7bf443eb8eda15b482d16ad9dd8137ad24 ("numa,cpumask: move
> numa_node_id default implementation to topology.h") removed the include
> of linux/topology.h from linux/mmzone.h which exposed this lack.
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Acked-by: Rusty Russell <rusty@rustcorp.com.au>

Ingo, please apply.

Apparently sparc is similarly broken :(

Rusty.
Ingo Molnar March 19, 2009, 11:53 a.m. UTC | #2
* Rusty Russell <rusty@rustcorp.com.au> wrote:

> On Thursday 19 March 2009 21:23:00 Stephen Rothwell wrote:
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Thu, 19 Mar 2009 21:35:24 +1100
> > Subject: [PATCH] powerpc: mmzone.h needs cpumask_t to be defined
> > 
> > Commit 082edb7bf443eb8eda15b482d16ad9dd8137ad24 ("numa,cpumask: move
> > numa_node_id default implementation to topology.h") removed the include
> > of linux/topology.h from linux/mmzone.h which exposed this lack.
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> 
> Acked-by: Rusty Russell <rusty@rustcorp.com.au>
> 
> Ingo, please apply.
> 
> Apparently sparc is similarly broken :(

I've applied it.

( I cannot push it to the auto-cpus4096-next branch yet because you
  broke the scheduler as well (boot crash) so the topic is marked
  broken. )

	Ingo
Stephen Rothwell March 19, 2009, 9:22 p.m. UTC | #3
Hi Ingo,

On Thu, 19 Mar 2009 12:53:42 +0100 Ingo Molnar <mingo@elte.hu> wrote:
>
> I've applied it.

Thanks.
diff mbox

Patch

diff --git a/arch/powerpc/include/asm/mmzone.h b/arch/powerpc/include/asm/mmzone.h
index 19f299b..35acac9 100644
--- a/arch/powerpc/include/asm/mmzone.h
+++ b/arch/powerpc/include/asm/mmzone.h
@@ -8,6 +8,7 @@ 
 #define _ASM_MMZONE_H_
 #ifdef __KERNEL__
 
+#include <linux/cpumask.h>
 
 /*
  * generic non-linear memory support: