Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 302788
b: refs/heads/master
c: 9a13472
h: refs/heads/master
v: v3
  • Loading branch information
Thomas Gleixner committed Apr 26, 2012
1 parent adc3df5 commit da04509
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f0a2bc7e54bb51f64d4c2cd5942ba6018a13d762
refs/heads/master: 9a1347237492f273f84ec39962b5806c70b2806a
1 change: 1 addition & 0 deletions trunk/arch/parisc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ config PARISC
select GENERIC_PCI_IOMAP
select IRQ_PER_CPU
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_SMP_IDLE_THREAD

help
The PA-RISC microprocessor is designed by Hewlett-Packard and used
Expand Down
23 changes: 2 additions & 21 deletions trunk/arch/parisc/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -334,26 +334,11 @@ void __init smp_callin(void)
/*
* Bring one cpu online.
*/
int __cpuinit smp_boot_one_cpu(int cpuid)
int __cpuinit smp_boot_one_cpu(int cpuid, struct task_struct *idle)
{
const struct cpuinfo_parisc *p = &per_cpu(cpu_data, cpuid);
struct task_struct *idle;
long timeout;

/*
* Create an idle task for this CPU. Note the address wed* give
* to kernel_thread is irrelevant -- it's going to start
* where OS_BOOT_RENDEVZ vector in SAL says to start. But
* this gets all the other task-y sort of data structures set
* up like we wish. We need to pull the just created idle task
* off the run queue and stuff it into the init_tasks[] array.
* Sheesh . . .
*/

idle = fork_idle(cpuid);
if (IS_ERR(idle))
panic("SMP: fork failed for CPU:%d", cpuid);

task_thread_info(idle)->cpu = cpuid;

/* Let _start know what logical CPU we're booting
Expand Down Expand Up @@ -397,10 +382,6 @@ int __cpuinit smp_boot_one_cpu(int cpuid)
udelay(100);
barrier();
}

put_task_struct(idle);
idle = NULL;

printk(KERN_CRIT "SMP: CPU:%d is stuck.\n", cpuid);
return -1;

Expand Down Expand Up @@ -452,7 +433,7 @@ void smp_cpus_done(unsigned int cpu_max)
int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
{
if (cpu != 0 && cpu < parisc_max_cpus)
smp_boot_one_cpu(cpu);
smp_boot_one_cpu(cpu, tidle);

return cpu_online(cpu) ? 0 : -ENOSYS;
}
Expand Down

0 comments on commit da04509

Please sign in to comment.