Re: [Announce] 2.6.29-rc8-rt2

Ingo Molnar
2009-03-20T19:25:39Z

* Will Schmidt <will_schmidt@vnet.ibm.com> wrote:

> On Fri, 2009-03-20 at 18:45 +0100, Thomas Gleixner wrote:
> > We are pleased to announce the next update to our new preempt-rt
> > series.
> >
> > - resurrected ARM and PowerPC support
> > - tracing fixes for ARM (Uwe Kleine-Koenig)
> >
> > The support for ARM/PowerPC has only been lightly tested. It might
> > crash and burn your system, make your hair curl, frigthen your cat and
> > give you sleepless nights. You have been warned !
>
> During a build attempt on powerpc, I am seeing:
>
> 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:40,
> from include/linux/rculist.h:11,
> from include/linux/dcache.h:7,
> from include/linux/fs.h:299,
> from init/do_mounts_rd.c:4:
> /root/linux-2.6.29-rc8/arch/powerpc/include/asm/mmzone.h:32: error:
> expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before
> ‘numa_cpumask_lookup_table’
> In file included from include/linux/topology.h:35,
> from include/linux/gfp.h:8,
> from include/linux/slab.h:13,
> from include/linux/percpu.h:6,
> from include/linux/rcupdate.h:40,
> from include/linux/rculist.h:11,
> from include/linux/dcache.h:7,
> from include/linux/fs.h:299,
> from init/do_mounts_rd.c:4:
> /root/linux-2.6.29-rc8/arch/powerpc/include/asm/topology.h: In function
> ‘node_to_cpumask’:
> /root/linux-2.6.29-rc8/arch/powerpc/include/asm/topology.h:22: error:
> ‘numa_cpumask_lookup_table’ undeclared (first use in this function)
> /root/linux-2.6.29-rc8/arch/powerpc/include/asm/topology.h:22: error:
> (Each undeclared identifier is reported only once
> /root/linux-2.6.29-rc8/arch/powerpc/include/asm/topology.h:22: error:
> for each function it appears in.)
> /root/linux-2.6.29-rc8/arch/powerpc/include/asm/topology.h: In function
> ‘node_to_first_cpu’:
> /root/linux-2.6.29-rc8/arch/powerpc/include/asm/topology.h:29: error:
> ‘numa_cpumask_lookup_table’ undeclared (first use in this function)
> make[1]: *** [init/do_mounts_rd.o] Error 1
> make[1]: *** Waiting for unfinished jobs....
>
>
>
> I have locally fixed by adding an include just above the cpumask_t
> reference. The include may belong elsewhere, but in case I got it
> right,.. :-)
>
> Signed-Off-By: Will Schmidt <will_schmidt@vnet.ibm.com>

you got it right :-) The full fix (the bug also affects sparc) is
already queued up - see it below.

Ingo

-------------->
From 0c7e5b187fc599a40c1e6392926424d26cd0cf41 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Mar 2009 22:03:22 +1100
Subject: [PATCH] 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])
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html