From: Stephen Rothwell <hidden> Date: 2009-03-19 10:53:04
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Stephen Rothwell <redacted>
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 <redacted>
---
arch/powerpc/include/asm/mmzone.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
From: Stephen Rothwell <hidden> Date: 2009-03-19 11:03:25
Hi again,
On Thu, 19 Mar 2009 21:53:00 +1100 Stephen Rothwell [off-list ref] wrote:
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.
Same for sparc64 defconfig.
In file included from include/linux/mmzone.h:776,
from include/linux/gfp.h:5,
from include/linux/slab.h:13,
from include/linux/percpu.h:6,
from include/linux/rcupdate.h:41,
from include/linux/rculist.h:11,
from include/linux/dcache.h:7,
from include/linux/fs.h:299,
from init/initramfs.c:3:
arch/sparc/include/asm/mmzone.h:13: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'numa_cpumask_lookup_table'
I have modified the patch as below.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Stephen Rothwell <redacted>
Date: Thu, 19 Mar 2009 21:35:24 +1100
Subject: [PATCH] powerpc/sparc: mmzone.h needs cpumask_t to be defined
Signed-off-by: Stephen Rothwell <redacted>
---
arch/powerpc/include/asm/mmzone.h | 1 +
arch/sparc/include/asm/mmzone.h | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
From: Rusty Russell <hidden> Date: 2009-03-19 11:07:24
On Thursday 19 March 2009 21:23:00 Stephen Rothwell wrote:
From: Stephen Rothwell <redacted>
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 <redacted>
Acked-by: Rusty Russell <redacted>
Ingo, please apply.
Apparently sparc is similarly broken :(
Rusty.
On Thursday 19 March 2009 21:23:00 Stephen Rothwell wrote:
quoted
From: Stephen Rothwell <redacted>
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 <redacted>
Acked-by: Rusty Russell <redacted>
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
From: Stephen Rothwell <hidden> Date: 2009-03-19 11:55:47
Commit-ID: 17ad6ea621b1c7952ebd7330ce65de26b6ee9cca
Gitweb: http://git.kernel.org/tip/17ad6ea621b1c7952ebd7330ce65de26b6ee9cca
Author: Stephen Rothwell [off-list ref]
AuthorDate: Thu, 19 Mar 2009 22:03:22 +1100
Committer: Ingo Molnar [off-list ref]
CommitDate: Thu, 19 Mar 2009 12:51:25 +0100
numa, cpumask: move numa_node_id default implementation to topology.h, fix
Impact: build fix for powerpc and sparc
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'
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.
Same for sparc64 defconfig.
Signed-off-by: Stephen Rothwell <redacted>
Acked-b: Rusty Russell [off-list ref]
Cc: ppc-dev <redacted>
LKML-Reference: [off-list ref]
Signed-off-by: Ingo Molnar <redacted>
---
arch/powerpc/include/asm/mmzone.h | 1 +
arch/sparc/include/asm/mmzone.h | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)