aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/smp.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-05-03 22:37:06 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-03 22:37:06 +0100
commit941f81c16ec7497ecce6f1f611277d67e89bdfe1 (patch)
tree4543aa365058fc52f051ea4881e1dc231f39774c /arch/arm/kernel/smp.c
parente220ba60223a9d63e70217e5b112160df8c21cea (diff)
parent478ea14466fb524b4cd90cdf0b8845f8c5ee6015 (diff)
downloadkernel_goldelico_gta04-941f81c16ec7497ecce6f1f611277d67e89bdfe1.zip
kernel_goldelico_gta04-941f81c16ec7497ecce6f1f611277d67e89bdfe1.tar.gz
kernel_goldelico_gta04-941f81c16ec7497ecce6f1f611277d67e89bdfe1.tar.bz2
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.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 577543f..a01194e 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -86,6 +86,12 @@ int __cpuinit __cpu_up(unsigned int cpu)
return PTR_ERR(idle);
}
ci->idle = idle;
+ } else {
+ /*
+ * Since this idle thread is being re-used, call
+ * init_idle() to reinitialize the thread structure.
+ */
+ init_idle(idle, cpu);
}
/*