diff options
Diffstat (limited to 'arch/um/kernel/smp.c')
| -rw-r--r-- | arch/um/kernel/smp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c index 155206a66908..6f588e160fb0 100644 --- a/arch/um/kernel/smp.c +++ b/arch/um/kernel/smp.c | |||
| @@ -76,7 +76,7 @@ static int idle_proc(void *cpup) | |||
| 76 | cpu_relax(); | 76 | cpu_relax(); |
| 77 | 77 | ||
| 78 | notify_cpu_starting(cpu); | 78 | notify_cpu_starting(cpu); |
| 79 | cpu_set(cpu, cpu_online_map); | 79 | set_cpu_online(cpu, true); |
| 80 | default_idle(); | 80 | default_idle(); |
| 81 | return 0; | 81 | return 0; |
| 82 | } | 82 | } |
| @@ -110,8 +110,7 @@ void smp_prepare_cpus(unsigned int maxcpus) | |||
| 110 | for (i = 0; i < ncpus; ++i) | 110 | for (i = 0; i < ncpus; ++i) |
| 111 | set_cpu_possible(i, true); | 111 | set_cpu_possible(i, true); |
| 112 | 112 | ||
| 113 | cpu_clear(me, cpu_online_map); | 113 | set_cpu_online(me, true); |
| 114 | cpu_set(me, cpu_online_map); | ||
| 115 | cpu_set(me, cpu_callin_map); | 114 | cpu_set(me, cpu_callin_map); |
| 116 | 115 | ||
| 117 | err = os_pipe(cpu_data[me].ipi_pipe, 1, 1); | 116 | err = os_pipe(cpu_data[me].ipi_pipe, 1, 1); |
| @@ -138,13 +137,13 @@ void smp_prepare_cpus(unsigned int maxcpus) | |||
| 138 | 137 | ||
| 139 | void smp_prepare_boot_cpu(void) | 138 | void smp_prepare_boot_cpu(void) |
| 140 | { | 139 | { |
| 141 | cpu_set(smp_processor_id(), cpu_online_map); | 140 | set_cpu_online(smp_processor_id(), true); |
| 142 | } | 141 | } |
| 143 | 142 | ||
| 144 | int __cpu_up(unsigned int cpu) | 143 | int __cpu_up(unsigned int cpu) |
| 145 | { | 144 | { |
| 146 | cpu_set(cpu, smp_commenced_mask); | 145 | cpu_set(cpu, smp_commenced_mask); |
| 147 | while (!cpu_isset(cpu, cpu_online_map)) | 146 | while (!cpu_online(cpu)) |
| 148 | mb(); | 147 | mb(); |
| 149 | return 0; | 148 | return 0; |
| 150 | } | 149 | } |
