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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 12 Apr 2011 14:00:40 +1000

Hi all,

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

kernel/sched.c:7140: error: 'cpu_coregroup_mask' undeclared here (not in a function)

Caused by commit 2c402dc3bb50 ("sched: Unify the sched_domain build
functions").  On sparc64, cpu_coregroup_mask is a #define, not a function.

I applied tha patch below (idea stolen from s390) whcih could probably be
better.

From: Stephen Rothwell <[email-masked]>
Date: Tue, 12 Apr 2011 13:51:32 +1000
Subject: [PATCH] sched: fix sparc64 for sched_domain changes

Fixes this compile error:

kernel/sched.c:7140: error: 'cpu_coregroup_mask' undeclared here (not in a function)

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 arch/sparc/include/asm/topology_64.h |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h
index 1c79f32..16f477d 100644
--- a/arch/sparc/include/asm/topology_64.h
+++ b/arch/sparc/include/asm/topology_64.h
@@ -65,6 +65,10 @@ static inline int pcibus_to_node(struct pci_bus *pbus)
 #define smt_capable()				(sparc64_multi_core)
 #endif /* CONFIG_SMP */
 
-#define cpu_coregroup_mask(cpu)			(&cpu_core_map[cpu])
+extern cpumask_t cpu_core_map[NR_CPUS];
+static inline const struct cpumask *cpu_coregroup_mask(int cpu)
+{
+        return &cpu_core_map[cpu];
+}
 
 #endif /* _ASM_SPARC64_TOPOLOGY_H */
-- 
1.7.4.1

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/