iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: make __smp_prepare_cpu void

Browse Source 
We have already removed the only condition that could fail here.
so just don't test for any return value

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Glauber de Oliveira Costa 2008-03-19 14:25:16 -03:00 committed by Ingo Molnar
parent f915d7f46b
commit f3ce4466ab
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/x86/kernel/smpboot_32.c
View File

@ -704,11 +704,11 @@ static void __cpuinit do_warm_boot_cpu(struct work_struct *work)
complete(info->complete); complete(info->complete);
} }
static int __cpuinit __smp_prepare_cpu(int cpu) static void __cpuinit __smp_prepare_cpu(int cpu)
{ {
DECLARE_COMPLETION_ONSTACK(done); DECLARE_COMPLETION_ONSTACK(done);
struct warm_boot_cpu_info info; struct warm_boot_cpu_info info;
int apicid, ret; int apicid;
apicid = per_cpu(x86_cpu_to_apicid, cpu); apicid = per_cpu(x86_cpu_to_apicid, cpu);
@ -725,9 +725,6 @@ static int __cpuinit __smp_prepare_cpu(int cpu)
wait_for_completion(&done); wait_for_completion(&done);
zap_low_mappings(); zap_low_mappings();
ret = 0;
exit:
return ret;
} }
#endif #endif
@ -950,7 +947,6 @@ int __cpuinit native_cpu_up(unsigned int cpu)
{ {
int apicid = cpu_present_to_apicid(cpu); int apicid = cpu_present_to_apicid(cpu);
unsigned long flags; unsigned long flags;
int ret = 0;
WARN_ON(irqs_disabled()); WARN_ON(irqs_disabled());
@ -971,10 +967,7 @@ int __cpuinit native_cpu_up(unsigned int cpu)
* when a cpu is taken offline from cpu_exit_clear(). * when a cpu is taken offline from cpu_exit_clear().
*/ */
if (!cpu_isset(cpu, cpu_callin_map)) if (!cpu_isset(cpu, cpu_callin_map))
ret = __smp_prepare_cpu(cpu); __smp_prepare_cpu(cpu);
if (ret)
return -EIO;
#endif #endif
/* In case one didn't come up */ /* In case one didn't come up */