diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 21:50:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 21:50:57 -0400 |
| commit | a5324343955997d1439f26518ddac567cd5d134b (patch) | |
| tree | f43558389c41e3a0f076c4ee55d77c4aa1561779 /kernel/stop_machine.c | |
| parent | 8199d3a79c224bbe5943fa08684e1f93a17881b0 (diff) | |
| parent | a4936044001694f033fe4ea94d6034d51a6b465c (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'kernel/stop_machine.c')
| -rw-r--r-- | kernel/stop_machine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index 6116b25aa7cf..84a9d18aa8da 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c | |||
| @@ -100,7 +100,7 @@ static int stop_machine(void) | |||
| 100 | stopmachine_state = STOPMACHINE_WAIT; | 100 | stopmachine_state = STOPMACHINE_WAIT; |
| 101 | 101 | ||
| 102 | for_each_online_cpu(i) { | 102 | for_each_online_cpu(i) { |
| 103 | if (i == _smp_processor_id()) | 103 | if (i == raw_smp_processor_id()) |
| 104 | continue; | 104 | continue; |
| 105 | ret = kernel_thread(stopmachine, (void *)(long)i,CLONE_KERNEL); | 105 | ret = kernel_thread(stopmachine, (void *)(long)i,CLONE_KERNEL); |
| 106 | if (ret < 0) | 106 | if (ret < 0) |
| @@ -182,7 +182,7 @@ struct task_struct *__stop_machine_run(int (*fn)(void *), void *data, | |||
| 182 | 182 | ||
| 183 | /* If they don't care which CPU fn runs on, bind to any online one. */ | 183 | /* If they don't care which CPU fn runs on, bind to any online one. */ |
| 184 | if (cpu == NR_CPUS) | 184 | if (cpu == NR_CPUS) |
| 185 | cpu = _smp_processor_id(); | 185 | cpu = raw_smp_processor_id(); |
| 186 | 186 | ||
| 187 | p = kthread_create(do_stop, &smdata, "kstopmachine"); | 187 | p = kthread_create(do_stop, &smdata, "kstopmachine"); |
| 188 | if (!IS_ERR(p)) { | 188 | if (!IS_ERR(p)) { |