diff options
author | Graf Yang <graf.yang@analog.com> | 2009-12-28 04:27:27 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-03-09 00:30:47 -0500 |
commit | 682f5dc4ed7cdef1f55e40ee505c4346dfa6fa91 (patch) | |
tree | b2d2a1b10747d06fa2779a643bda20bad7f91727 | |
parent | 0325f25a919ed09d11b16ec8eccf95618dc36601 (diff) |
Blackfin: drop cpu_callin_map on SMP systems
Common API already provides functions for managing online CPUs.
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r-- | arch/blackfin/mach-bf561/smp.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/blackfin/mach-bf561/smp.c b/arch/blackfin/mach-bf561/smp.c index 0192532e96a2..ec93f3ef8fa3 100644 --- a/arch/blackfin/mach-bf561/smp.c +++ b/arch/blackfin/mach-bf561/smp.c | |||
@@ -14,8 +14,6 @@ | |||
14 | 14 | ||
15 | static DEFINE_SPINLOCK(boot_lock); | 15 | static DEFINE_SPINLOCK(boot_lock); |
16 | 16 | ||
17 | static cpumask_t cpu_callin_map; | ||
18 | |||
19 | /* | 17 | /* |
20 | * platform_init_cpus() - Tell the world about how many cores we | 18 | * platform_init_cpus() - Tell the world about how many cores we |
21 | * have. This is called while setting up the architecture support | 19 | * have. This is called while setting up the architecture support |
@@ -72,7 +70,7 @@ void __cpuinit platform_secondary_init(unsigned int cpu) | |||
72 | bfin_setup_cpudata(cpu); | 70 | bfin_setup_cpudata(cpu); |
73 | 71 | ||
74 | /* We are done with local CPU inits, unblock the boot CPU. */ | 72 | /* We are done with local CPU inits, unblock the boot CPU. */ |
75 | cpu_set(cpu, cpu_callin_map); | 73 | set_cpu_online(cpu, true); |
76 | spin_lock(&boot_lock); | 74 | spin_lock(&boot_lock); |
77 | spin_unlock(&boot_lock); | 75 | spin_unlock(&boot_lock); |
78 | } | 76 | } |
@@ -95,14 +93,13 @@ int __cpuinit platform_boot_secondary(unsigned int cpu, struct task_struct *idle | |||
95 | 93 | ||
96 | timeout = jiffies + 1 * HZ; | 94 | timeout = jiffies + 1 * HZ; |
97 | while (time_before(jiffies, timeout)) { | 95 | while (time_before(jiffies, timeout)) { |
98 | if (cpu_isset(cpu, cpu_callin_map)) | 96 | if (cpu_online(cpu)) |
99 | break; | 97 | break; |
100 | udelay(100); | 98 | udelay(100); |
101 | barrier(); | 99 | barrier(); |
102 | } | 100 | } |
103 | 101 | ||
104 | if (cpu_isset(cpu, cpu_callin_map)) { | 102 | if (cpu_online(cpu)) { |
105 | cpu_set(cpu, cpu_online_map); | ||
106 | /* release the lock and let coreb run */ | 103 | /* release the lock and let coreb run */ |
107 | spin_unlock(&boot_lock); | 104 | spin_unlock(&boot_lock); |
108 | return 0; | 105 | return 0; |