diff options
| author | Sundar R Iyer <sundar.iyer@stericsson.com> | 2010-02-09 15:52:26 +0530 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:14:40 +0200 |
| commit | 37c87f26a379ea83f40bd8605814b026c7120c7f (patch) | |
| tree | d3ca2308aca2e960b31cdf5b15fc507df6d0bd8d /arch/arm/kernel/process.c | |
| parent | 7996d5dae24b20055efd3198bbda00e1c3790911 (diff) | |
ARM : handle preempt count in cpu_idle
Signed-off-by: Sundar R Iyer <sundar.iyer@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Diffstat (limited to 'arch/arm/kernel/process.c')
| -rw-r--r-- | arch/arm/kernel/process.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 5e1e5419722..99c0d6b2cd4 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -186,8 +186,17 @@ void cpu_idle(void) leds_event(led_idle_start); while (!need_resched()) { #ifdef CONFIG_HOTPLUG_CPU - if (cpu_is_offline(smp_processor_id())) + if (cpu_is_offline(smp_processor_id())) { + + /* NOTE : preempt_count() should be 0 for dying CPU + * as the CPU will use this very thread when + * it is alive + */ + if (preempt_count()) + preempt_enable_no_resched(); + cpu_die(); + } #endif local_irq_disable(); |