diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-12 14:00:40 +1000 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-12 08:46:41 +0200 |
| commit | 3905c54f2bd2c6f937f87307987ca072eabc3e7b (patch) | |
| tree | 553aab7b0056cdcd0c44a5e4cacf0ae7be2b06c9 /arch/sparc | |
| parent | 60495e7760d8ee364695006af37309b0755e0e17 (diff) | |
sched, sparc64: Turn cpu_coregroup_mask() into a real function
This compile error triggers on Sparc64:
kernel/sched.c:7140: error: 'cpu_coregroup_mask' undeclared here (not in a function)
Because after the recent scheduler domain cleanups the scheduler
uses this arch method as a function pointer in a scheduler
topology data structure - which is not possible with a macro.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20110412140040.3020ef55.sfr@canb.auug.org.au
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | 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 1c79f32734a..8b9c556d630 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 */ |