From 67648d6f37f245bc115c917543e7430048be9115 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 12 Apr 2011 14:00:40 +1000
Subject: [PATCH] --- yaml --- r: 245567 b: refs/heads/master c:
 3905c54f2bd2c6f937f87307987ca072eabc3e7b h: refs/heads/master i:   245565:
 45adb90deb43bd48b2214cdb1a6f2d1df7b735c3   245563:
 8695ee0d34d901f561ae764ba281fa0d00144282   245559:
 754958812dad07b058f9f8686fa87395c548e306   245551:
 c73f8481113614be601e50f3a06f1f64616e844a   245535:
 3ee8572529ed0798f309893361c9e22056db91ea   245503:
 0ddf95c0b7b7fa09762f8d70f81afa7854636e93 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/sparc/include/asm/topology_64.h | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 031b091a2ab0..712c365ef0ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60495e7760d8ee364695006af37309b0755e0e17
+refs/heads/master: 3905c54f2bd2c6f937f87307987ca072eabc3e7b
diff --git a/trunk/arch/sparc/include/asm/topology_64.h b/trunk/arch/sparc/include/asm/topology_64.h
index 1c79f32734a0..8b9c556d630b 100644
--- a/trunk/arch/sparc/include/asm/topology_64.h
+++ b/trunk/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 */