diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-06-23 16:46:23 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-06-23 16:46:23 -0400 |
| commit | 8cf60e04a131310199d5776e2f9e915f0c468899 (patch) | |
| tree | 373a68e88e6737713a0a5723d552cdeefffff929 /arch/powerpc/kernel/smp.c | |
| parent | 1323523f505606cfd24af6122369afddefc3b09d (diff) | |
| parent | 95eaa5fa8eb2c345244acd5f65b200b115ae8c65 (diff) | |
Auto-update from upstream
Diffstat (limited to 'arch/powerpc/kernel/smp.c')
| -rw-r--r-- | arch/powerpc/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index 530f7dba0bd2..c5d179d4f818 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c | |||
| @@ -492,7 +492,7 @@ int __devinit __cpu_up(unsigned int cpu) | |||
| 492 | * -- Cort | 492 | * -- Cort |
| 493 | */ | 493 | */ |
| 494 | if (system_state < SYSTEM_RUNNING) | 494 | if (system_state < SYSTEM_RUNNING) |
| 495 | for (c = 5000; c && !cpu_callin_map[cpu]; c--) | 495 | for (c = 50000; c && !cpu_callin_map[cpu]; c--) |
| 496 | udelay(100); | 496 | udelay(100); |
| 497 | #ifdef CONFIG_HOTPLUG_CPU | 497 | #ifdef CONFIG_HOTPLUG_CPU |
| 498 | else | 498 | else |