path: root/arch/powerpc/platforms/pseries/hotplug-cpu.c
diff options
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-07-31 15:04:15 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-07-31 15:04:15 +1000
commit940ce422a367c8e65404a5ef1ff5969527a06410 (patch)
tree0577a96cd6ea362d4bf9974add8c59497d7162a7 /arch/powerpc/platforms/pseries/hotplug-cpu.c
parentd77cb21b578a5428482bc0fd187f7c0518a0b32a (diff)
powerpc/pseries: Increase cpu die timeout
In testing SMT disable, we have been regularly seeing the following message: Querying DEAD? cpu %i (%i) shows %i This indicates the current delay in pseries_cpu_die where we wait for the specified CPU to die, is insufficient. Usually, this does not cause a problem, but we've seen this result in BUG_ON's going off in the timer code when we try to migrate the timers off the dead cpu while a timer is still running. Increasing this delay, as is done in this patch, seems to resolve this issue. Signed-off-by: Brian King <brking@linux.vnet.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/pseries/hotplug-cpu.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index bbe50763536..fd50ccd4bac 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -193,12 +193,12 @@ static void pseries_cpu_die(unsigned int cpu)
if (get_preferred_offline_state(cpu) == CPU_STATE_INACTIVE) {
cpu_status = 1;
- for (tries = 0; tries < 1000; tries++) {
+ for (tries = 0; tries < 5000; tries++) {
if (get_cpu_current_state(cpu) == CPU_STATE_INACTIVE) {
cpu_status = 0;
- cpu_relax();
+ msleep(1);
} else if (get_preferred_offline_state(cpu) == CPU_STATE_OFFLINE) {