diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
| commit | ac1d426e825ab5778995f2f6f053ca2e6b45c622 (patch) | |
| tree | 75b91356ca39463e0112931aa6790802fb1e07a2 /arch/arm/kernel/smp.c | |
| parent | fda0e18c8a7a3e02747c2b045b4fcd2c920410b9 (diff) | |
| parent | a3685f00652af83f12b63e3b4ef48f29581ba48b (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig
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 7a3cc0266934..b8c3d0f689d9 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 | /* |