diff options
| author | Anton Altaparmakov <anton@tuxera.com> | 2012-02-27 04:01:22 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <anton@tuxera.com> | 2012-02-27 04:01:22 -0500 |
| commit | f621c5334396fd153cd882ea92466823b7e7b821 (patch) | |
| tree | 7b829cad44dc0e5003d7cacac3a7a1b128637083 /arch/sh/kernel/topology.c | |
| parent | 0afa1b62e33250d4777c5803a98ae69fbe872061 (diff) | |
| parent | 500dd2370e77c9551ba298bdeeb91b02d8402199 (diff) | |
Merge branch 'master' of /Volumes/CaseSensitiveDisk/linux
Diffstat (limited to 'arch/sh/kernel/topology.c')
| -rw-r--r-- | arch/sh/kernel/topology.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/topology.c b/arch/sh/kernel/topology.c index 4649a6ff0cfe..772caffba22f 100644 --- a/arch/sh/kernel/topology.c +++ b/arch/sh/kernel/topology.c | |||
| @@ -27,7 +27,7 @@ static cpumask_t cpu_coregroup_map(unsigned int cpu) | |||
| 27 | * Presently all SH-X3 SMP cores are multi-cores, so just keep it | 27 | * Presently all SH-X3 SMP cores are multi-cores, so just keep it |
| 28 | * simple until we have a method for determining topology.. | 28 | * simple until we have a method for determining topology.. |
| 29 | */ | 29 | */ |
| 30 | return cpu_possible_map; | 30 | return *cpu_possible_mask; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | const struct cpumask *cpu_coregroup_mask(unsigned int cpu) | 33 | const struct cpumask *cpu_coregroup_mask(unsigned int cpu) |