* linux-next: cpus4096 tree build failure
@ 2009-03-19 10:53 Stephen Rothwell
2009-03-19 11:03 ` Stephen Rothwell
2009-03-19 11:07 ` linux-next: cpus4096 tree build failure Rusty Russell
0 siblings, 2 replies; 6+ messages in thread
From: Stephen Rothwell @ 2009-03-19 10:53 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin
Cc: ppc-dev, Rusty Russell, linux-next
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 <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>
---
arch/powerpc/include/asm/mmzone.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
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:
--
1.6.2.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: linux-next: cpus4096 tree build failure
2009-03-19 10:53 linux-next: cpus4096 tree build failure Stephen Rothwell
@ 2009-03-19 11:03 ` Stephen Rothwell
2009-03-19 11:54 ` [tip:cpus4096] numa, cpumask: move numa_node_id default implementation to topology.h, fix Stephen Rothwell
2009-03-19 11:07 ` linux-next: cpus4096 tree build failure Rusty Russell
1 sibling, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2009-03-19 11:03 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin
Cc: ppc-dev, Rusty Russell, linux-next
Hi again,
On Thu, 19 Mar 2009 21:53:00 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
arch/powerpc/include/asm/mmzone.h | 1 +
arch/sparc/include/asm/mmzone.h | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
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:
diff --git a/arch/sparc/include/asm/mmzone.h b/arch/sparc/include/asm/mmzone.h
index ebf5986..e8c6487 100644
--- a/arch/sparc/include/asm/mmzone.h
+++ b/arch/sparc/include/asm/mmzone.h
@@ -3,6 +3,8 @@
#ifdef CONFIG_NEED_MULTIPLE_NODES
+#include <linux/cpumask.h>
+
extern struct pglist_data *node_data[];
#define NODE_DATA(nid) (node_data[nid])
--
1.6.2.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: linux-next: cpus4096 tree build failure
2009-03-19 10:53 linux-next: cpus4096 tree build failure Stephen Rothwell
2009-03-19 11:03 ` Stephen Rothwell
@ 2009-03-19 11:07 ` Rusty Russell
2009-03-19 11:53 ` Ingo Molnar
1 sibling, 1 reply; 6+ messages in thread
From: Rusty Russell @ 2009-03-19 11:07 UTC (permalink / raw)
To: Stephen Rothwell
Cc: ppc-dev, Thomas Gleixner, linux-next, Ingo Molnar, H. Peter Anvin
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: cpus4096 tree build failure
2009-03-19 11:07 ` linux-next: cpus4096 tree build failure Rusty Russell
@ 2009-03-19 11:53 ` Ingo Molnar
2009-03-19 21:22 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Ingo Molnar @ 2009-03-19 11:53 UTC (permalink / raw)
To: Rusty Russell
Cc: ppc-dev, Stephen Rothwell, Thomas Gleixner, linux-next, H. Peter Anvin
* 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [tip:cpus4096] numa, cpumask: move numa_node_id default implementation to topology.h, fix
2009-03-19 11:03 ` Stephen Rothwell
@ 2009-03-19 11:54 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2009-03-19 11:54 UTC (permalink / raw)
To: linux-tip-commits
Cc: sfr, linux-kernel, linuxppc-dev, mingo, hpa, tglx, mingo
Commit-ID: 17ad6ea621b1c7952ebd7330ce65de26b6ee9cca
Gitweb: http://git.kernel.org/tip/17ad6ea621b1c7952ebd7330ce65de26b6ee9cca
Author: Stephen Rothwell <sfr@canb.auug.org.au>
AuthorDate: Thu, 19 Mar 2009 22:03:22 +1100
Committer: Ingo Molnar <mingo@elte.hu>
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 <sfr@canb.auug.org.au>
Acked-b: Rusty Russell <rusty@rustcorp.com.au>
Cc: ppc-dev <linuxppc-dev@ozlabs.org>
LKML-Reference: <20090319220322.3baa4613.sfr@canb.auug.org.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/powerpc/include/asm/mmzone.h | 1 +
arch/sparc/include/asm/mmzone.h | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
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:
diff --git a/arch/sparc/include/asm/mmzone.h b/arch/sparc/include/asm/mmzone.h
index ebf5986..e8c6487 100644
--- a/arch/sparc/include/asm/mmzone.h
+++ b/arch/sparc/include/asm/mmzone.h
@@ -3,6 +3,8 @@
#ifdef CONFIG_NEED_MULTIPLE_NODES
+#include <linux/cpumask.h>
+
extern struct pglist_data *node_data[];
#define NODE_DATA(nid) (node_data[nid])
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: linux-next: cpus4096 tree build failure
2009-03-19 11:53 ` Ingo Molnar
@ 2009-03-19 21:22 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2009-03-19 21:22 UTC (permalink / raw)
To: Ingo Molnar
Cc: ppc-dev, Thomas Gleixner, Rusty Russell, linux-next, H. Peter Anvin
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
Hi Ingo,
On Thu, 19 Mar 2009 12:53:42 +0100 Ingo Molnar <mingo@elte.hu> wrote:
>
> I've applied it.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-03-19 21:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-19 10:53 linux-next: cpus4096 tree build failure Stephen Rothwell
2009-03-19 11:03 ` Stephen Rothwell
2009-03-19 11:54 ` [tip:cpus4096] numa, cpumask: move numa_node_id default implementation to topology.h, fix Stephen Rothwell
2009-03-19 11:07 ` linux-next: cpus4096 tree build failure Rusty Russell
2009-03-19 11:53 ` Ingo Molnar
2009-03-19 21:22 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).