diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2011-01-05 06:48:09 -0500 |
---|---|---|
committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2011-01-05 06:47:30 -0500 |
commit | da7f51c11d5fedca9ba779ee220063ccb4f0a27e (patch) | |
tree | a8cd6d843e72128ad6bfef0f19ef601f27f56ba9 /arch/s390/kernel/process.c | |
parent | f230886b0b0f0ce604395481bea05f3c0ad8fc9e (diff) |
[S390] smp/idle: call init_idle() before starting a new cpu
Call init_idle() which (re-)initializes the idle task structure before
it gets used on a new cpu.
That way we can also get rid of the odd preempt_enable_no_resched()
call we have in the cpu offline path within cpu_idle(). That call
prevented preempt count imbalances between cpu hotplug operations.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/process.c')
-rw-r--r-- | arch/s390/kernel/process.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c index b825b3e1cb17..c2fffb57d727 100644 --- a/arch/s390/kernel/process.c +++ b/arch/s390/kernel/process.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #include <asm/irq.h> | 42 | #include <asm/irq.h> |
43 | #include <asm/timer.h> | 43 | #include <asm/timer.h> |
44 | #include <asm/nmi.h> | 44 | #include <asm/nmi.h> |
45 | #include <asm/smp.h> | ||
45 | #include "entry.h" | 46 | #include "entry.h" |
46 | 47 | ||
47 | asmlinkage void ret_from_fork(void) asm ("ret_from_fork"); | 48 | asmlinkage void ret_from_fork(void) asm ("ret_from_fork"); |
@@ -76,13 +77,8 @@ unsigned long thread_saved_pc(struct task_struct *tsk) | |||
76 | */ | 77 | */ |
77 | static void default_idle(void) | 78 | static void default_idle(void) |
78 | { | 79 | { |
79 | /* CPU is going idle. */ | 80 | if (cpu_is_offline(smp_processor_id())) |
80 | #ifdef CONFIG_HOTPLUG_CPU | ||
81 | if (cpu_is_offline(smp_processor_id())) { | ||
82 | preempt_enable_no_resched(); | ||
83 | cpu_die(); | 81 | cpu_die(); |
84 | } | ||
85 | #endif | ||
86 | local_irq_disable(); | 82 | local_irq_disable(); |
87 | if (need_resched()) { | 83 | if (need_resched()) { |
88 | local_irq_enable(); | 84 | local_irq_enable(); |