aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/vtime.c
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2012-08-27 15:43:49 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-09-26 15:44:53 +0200
commit1c725922dd8274b6e0b370ad33cfaef9013fd70b (patch)
treebbb73a34f41d5772b100d629b1fffbcf0c612622 /arch/s390/kernel/vtime.c
parents390/smp: fix smp_find_processor_id() argument mismatch (diff)
downloadlinux-dev-1c725922dd8274b6e0b370ad33cfaef9013fd70b.tar.xz
linux-dev-1c725922dd8274b6e0b370ad33cfaef9013fd70b.zip
s390/cpu hotplug: mask out CPU_TASKS_FROZEN in cu hotplug notifiers
Unify all our cpu hotplug notifiers to mask out the CPU_TASKS_FROZEN bit, so we don't have to add all the *_FROZEN variant cases to the notifiers. 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/vtime.c')
-rw-r--r--arch/s390/kernel/vtime.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 4fc97b40a6e1..d100c92cfcf8 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -378,9 +378,8 @@ static int __cpuinit s390_nohz_notify(struct notifier_block *self,
long cpu = (long) hcpu;
idle = &per_cpu(s390_idle, cpu);
- switch (action) {
+ switch (action & ~CPU_TASKS_FROZEN) {
case CPU_DYING:
- case CPU_DYING_FROZEN:
idle->nohz_delay = 0;
default:
break;