[SPARC64]: Fix leak when DR added cpu does not bootup.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2007-07-15 01:08:03 -07:00
parent b53bcb6799
commit b37d40d175

View file

@ -90,7 +90,6 @@ static volatile unsigned long callin_flag = 0;
void __devinit smp_callin(void)
{
int cpuid = hard_smp_processor_id();
struct trap_per_cpu *tb = &trap_block[cpuid];;
__local_per_cpu_offset = __per_cpu_offset(cpuid);
@ -119,11 +118,6 @@ void __devinit smp_callin(void)
atomic_inc(&init_mm.mm_count);
current->active_mm = &init_mm;
if (tb->hdesc) {
kfree(tb->hdesc);
tb->hdesc = NULL;
}
while (!cpu_isset(cpuid, smp_commenced_mask))
rmb();
@ -345,6 +339,7 @@ static struct thread_info *cpu_new_thread = NULL;
static int __devinit smp_boot_one_cpu(unsigned int cpu)
{
struct trap_per_cpu *tb = &trap_block[cpu];
unsigned long entry =
(unsigned long)(&sparc64_cpu_startup);
unsigned long cookie =
@ -389,6 +384,11 @@ static int __devinit smp_boot_one_cpu(unsigned int cpu)
}
cpu_new_thread = NULL;
if (tb->hdesc) {
kfree(tb->hdesc);
tb->hdesc = NULL;
}
return ret;
}