diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-03 17:37:06 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-03 17:37:06 -0400 |
| commit | 941f81c16ec7497ecce6f1f611277d67e89bdfe1 (patch) | |
| tree | 4543aa365058fc52f051ea4881e1dc231f39774c /arch/arm/kernel/smp.c | |
| parent | e220ba60223a9d63e70217e5b112160df8c21cea (diff) | |
| parent | 478ea14466fb524b4cd90cdf0b8845f8c5ee6015 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel-stable
Diffstat (limited to 'arch/arm/kernel/smp.c')
| -rw-r--r-- | arch/arm/kernel/smp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 577543f3857f..a01194e583ff 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
| @@ -86,6 +86,12 @@ int __cpuinit __cpu_up(unsigned int cpu) | |||
| 86 | return PTR_ERR(idle); | 86 | return PTR_ERR(idle); |
| 87 | } | 87 | } |
| 88 | ci->idle = idle; | 88 | ci->idle = idle; |
| 89 | } else { | ||
| 90 | /* | ||
| 91 | * Since this idle thread is being re-used, call | ||
| 92 | * init_idle() to reinitialize the thread structure. | ||
| 93 | */ | ||
| 94 | init_idle(idle, cpu); | ||
| 89 | } | 95 | } |
| 90 | 96 | ||
| 91 | /* | 97 | /* |